From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java
index 35aebbf..9bed63d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/file/clientutil/VciFileServerClientUtil.java
@@ -12,7 +12,7 @@
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.BaseModelVO;
 import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
 import com.vci.starter.web.util.LangBaseUtil;
 import com.vci.starter.web.util.LocalFileUtil;
 import com.vci.starter.web.util.VciBaseUtil;
@@ -210,7 +210,7 @@
             while(var11.hasNext()) {
                 File file = (File)var11.next();
                 VciFileObjectDTO tempDTO = new VciFileObjectDTO();
-                BeanUtil.convert(fileObjectDTO, tempDTO);
+                BeanUtilForVCI.convert(fileObjectDTO, tempDTO);
                 tempDTO.setFileExtension(this.getFileExtension(file.getName()));
                 tempDTO.setName(this.getFileNameNoExtension(file.getName()));
                 tempDTO.setId(this.getFileNameNoExtension(file.getName()));
@@ -771,13 +771,13 @@
 
     public VciFileObjectDTO fileObjectVO2DTO(VciFileObjectVO fileObjectVO) {
         VciFileObjectDTO fileObjectDTO = new VciFileObjectDTO();
-        BeanUtil.convert(fileObjectVO, fileObjectDTO);
+        BeanUtilForVCI.convert(fileObjectVO, fileObjectDTO);
         return fileObjectDTO;
     }
 
     public VciFileObjectDTO fileObjectVO2DTOForUpdate(VciFileObjectVO fileObjectVO) {
         VciFileObjectDTO fileObjectDTO = new VciFileObjectDTO();
-        BeanUtil.convert(fileObjectVO, fileObjectDTO);
+        BeanUtilForVCI.convert(fileObjectVO, fileObjectDTO);
         fileObjectDTO.setFileOid(fileObjectVO.getOid());
         fileObjectDTO.setUpdateFileFlag(true);
         return fileObjectDTO;

--
Gitblit v1.9.3