Merge remote-tracking branch 'origin/dev' into test

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java

@@ -12,7 +12,7 @@ public class ContactSaveReqVO {
     private Long id;
 
     @Schema(description = "类型甲方/乙方", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotEmpty(message = "类型甲方/乙方不能为空")
+//    @NotEmpty(message = "类型甲方/乙方不能为空")
     private String type;
 
     @Schema(description = "联系人", requiredMode = Schema.RequiredMode.REQUIRED)

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java

@@ -39,4 +39,6 @@ public class ErpFactoryRespVO {
 
     @Schema(description = "是否启用")
     private String isEnable;
+    @Schema(description = "操作类型")
+    private String operationType;
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java

@@ -33,4 +33,7 @@ public class ErpFactorySaveReqVO {
 
     @Schema(description = "是否启用")
     private String isEnable;
+
+    @Schema(description = "操作类型")
+    private String operationType;
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java

@@ -72,4 +72,10 @@ public class ErpFactoryDO extends BusinessBaseDO {
      */
     @TableField("IS_ENB")
     private String isEnable;
+
+    /**
+     * 操作类型
+     */
+    @TableField("OPTN_TP")
+    private String operationType;
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java

@@ -98,6 +98,7 @@ public class ErpFactoryServiceImpl implements ErpFactoryService {
         if (updateObj.getType().equals("ERP") || updateObj.getIsEnable().equals("1")) {
             throw exception(ERP_FACTORY_NOT_ALLOW_UPDATE);
         }
+        //不允许修改除了绑定工厂名称、绑定工厂编码和操作以外的信息
         erpFactoryMapper.updateById(updateObj);
     }