解决冲突 entity添加注解

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java

@@ -38,11 +38,6 @@ public class StaffWechatDTO implements Serializable {
      */
 	private String id;
 
-    /**
-     * 客户Id
-     */
-    private String customerId;
-
     /**
      * 用户Id user.id
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectOrgRelationDTO.java

@@ -116,9 +116,4 @@ public class ProjectOrgRelationDTO implements Serializable {
      */
 	private String updatedBy;
 
-    /**
-     * 客户ID
-     */
-    private String customerId;
-
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java

@@ -103,9 +103,5 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private Date updatedTime;
 
-    /**
-     * 客户ID
-     */
-    private String customerId;
 
 }

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java

@@ -39,11 +39,6 @@ public class RoleOperationDTO implements Serializable {
      */
 	private String id;
 
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
-
     /**
      * 角色ID
      */

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java

@@ -33,11 +33,6 @@ public class RoleScopeDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
-
     /**
      * 
      */

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -38,11 +40,6 @@ public class RoleOperationEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
-
     /**
      * 角色ID
      */
@@ -56,6 +53,7 @@ public class RoleOperationEntity extends BaseEpmetEntity {
 	/**
 	 * 客户ID
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -37,10 +39,6 @@ import java.util.Date;
 public class RoleScopeEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
 
     /**
      * 角色ID
@@ -60,6 +58,7 @@ public class RoleScopeEntity extends BaseEpmetEntity {
 	/**
 	 * 客户ID
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java

@@ -38,11 +38,6 @@ public class ProjectRelatedPersonnelDTO implements Serializable {
      */
 	private String id;
 
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
-
     /**
      * 项目ID
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -38,11 +40,6 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
-
     /**
      * 关联PROJECT_STAFF，由此ID可以关联出PROJECT_ID、CUSTOMER_ID、PROCESS_ID
      */
@@ -88,6 +85,7 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity {
 	/**
 	 * 客户ID
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -37,10 +39,6 @@ import java.util.Date;
 public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
 
     /**
      * 项目ID
@@ -75,6 +73,7 @@ public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity {
 	/**
 	 * 客户ID
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java

@@ -38,11 +38,6 @@ public class CustomerHomeDetailDTO implements Serializable {
      */
 	private String id;
 
-	/**
-	 * 客户ID
-	 */
-	private String customerId;
-
     /**
      * 界面ID customer_home.ID
      */

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -37,10 +39,7 @@ import java.util.Date;
 public class CustomerHomeDetailEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
-	/**
+
-	 * 客户ID
-	 */
-	private String customerId;
     /**
      * 界面ID customer_home.ID
      */
@@ -74,6 +73,7 @@ public class CustomerHomeDetailEntity extends BaseEpmetEntity {
 	/**
 	 * 客户ID
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffWechatDTO.java

@@ -129,9 +129,4 @@ public class StaffWechatDTO implements Serializable {
      */
 	private Date updatedTime;
 
-    /**
-     * 客户ID
-     */
-    private String customerId;
-
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -56,6 +58,7 @@ public class StaffRoleEntity extends BaseEpmetEntity {
 	/**
 	 * 客户ID
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffWechatEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -35,11 +37,6 @@ public class StaffWechatEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 客户Id
-	 */
-	private String customerId;
-
     /**
      * 用户Id user.id
      */
@@ -98,6 +95,7 @@ public class StaffWechatEntity extends BaseEpmetEntity {
 	/**
 	 * 客户ID
 	 */
+	@TableField(fill = FieldFill.INSERT)
 	private String customerId;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java

@@ -1,5 +1,7 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -32,6 +34,7 @@ public class UserEntity extends BaseEpmetEntity {
     /**
      * 客户ID
      */
+    @TableField(fill = FieldFill.INSERT)
     private String customerId;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java

@@ -1,5 +1,7 @@
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
@@ -77,6 +79,7 @@ public class UserWechatEntity extends BaseEpmetEntity {
     /**
      * 客户ID
      */
+    @TableField(fill = FieldFill.INSERT)
     private String customerId;