1.合并busUser分支代码，解决冲突

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.controller.basic;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
@@ -11,9 +12,7 @@ import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.UdiDlHttpClient;
-import com.glxp.api.admin.req.basic.CombineRequest;
-import com.glxp.api.admin.req.basic.RemoveRelRequest;
-import com.glxp.api.admin.req.basic.UdiInfoExportRequest;
+import com.glxp.api.admin.req.basic.*;
 import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
@@ -164,7 +163,9 @@ public class UdiContrastController {
             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
         } else {
             try {
-                udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
+                BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
+                udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
             } catch (Exception e) {
                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
             }
@@ -214,7 +215,9 @@ public class UdiContrastController {
             combineRequest.setRelId(removeRelRequest.getRelId());
             udiRelevanceEntity.setSupName("");
             udiRelevanceEntity.setPrice("");
-            udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+            UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
+            BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
+            udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         } catch (Exception e) {
             e.printStackTrace();
             return ResultVOUtils.error(500, "解除绑定失败！");
@@ -359,7 +362,9 @@ public class UdiContrastController {
         udiInfoEntity.setScbssfbhsxrq("是");
         udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
+        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+        udiInfoService.insertUdiInfo(udiInfoRequest);
     }
 
     public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {
@@ -369,7 +374,9 @@ public class UdiContrastController {
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
-        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+        UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
+        BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         insertUdiInfos(udiInfoEntities);
     }