Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/dwxx/vo/DwxxSaveReqVO.java

@@ -5,6 +5,7 @@ import lombok.*;
 
 import java.time.LocalDate;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 
@@ -31,7 +32,7 @@ public class DwxxSaveReqVO {
     private String lxfs;
 
     @Schema(description = "注册日期")
-    private LocalDate zcrq;
+    private LocalDateTime zcrq;
 
     @Schema(description = "通讯地址-省")
     private String sheng;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/kqxx/KqxxServiceImpl.java

@@ -64,6 +64,12 @@ public class KqxxServiceImpl implements KqxxService {
         validateKqxxExists(updateReqVO.getId());
         // 更新
         KqxxDO updateObj = BeanUtils.toBean(updateReqVO, KqxxDO.class);
+        String str = updateObj.getResid();
+        if (str != null && str.startsWith("[") && str.endsWith("]")) {
+            str = str.substring(1, str.length() - 1);
+        }
+        updateObj.setResid(str);
+
         kqxxMapper.updateById(updateObj);
     }