Merge remote-tracking branch 'origin/dev_add_customer_id' into dev_add_customer_id

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupOperationDTO.java

@@ -97,4 +97,9 @@ public class ResiGroupOperationDTO implements Serializable {
 	 * 消息通知内容
 	 * */
 	private String messageText;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupStatisticalDTO.java

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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java

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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/GroupMemeberOperationDTO.java

@@ -110,4 +110,9 @@ public class GroupMemeberOperationDTO implements Serializable {
 	 * OPERATE_USER_ID操作人id
 	 */
 	private String operateUserId;
+
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java

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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicCommentDTO.java

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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java

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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicOperationDTO.java

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

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/ResiTopicCommentEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.comment.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;
@@ -53,4 +55,10 @@ public class ResiTopicCommentEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupOperationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.group.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;
@@ -67,4 +69,10 @@ public class ResiGroupOperationEntity extends BaseEpmetEntity {
 	 * 消息通知内容
 	 * */
 	private String messageText;
+
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupStatisticalEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.group.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;
@@ -73,4 +75,10 @@ public class ResiGroupStatisticalEntity extends BaseEpmetEntity {
      */
 	private Integer totalNormalMemebers;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.invitation.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;
@@ -73,4 +75,10 @@ public class GroupInvitationEntity extends BaseEpmetEntity {
 	 */
 	private String invitationType;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.member.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;
@@ -80,4 +82,10 @@ Ps: 1) 入群被拒绝之后，如果再申请是插入一条新的审核中的
 	 * OPERATE_USER_ID操作人id
 	 */
 	private String operateUserId;
+
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/ResiGroupMemberEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.member.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;
@@ -68,4 +70,10 @@ public class ResiGroupMemberEntity extends BaseEpmetEntity {
      */
 	private String status;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.topic.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;
@@ -73,4 +75,9 @@ public class ResiTopicAttachmentEntity extends BaseEpmetEntity {
 	 * */
 	private Integer duration;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.topic.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;
@@ -98,4 +100,10 @@ public class ResiTopicEntity extends BaseEpmetEntity {
 	 * */
 	private Boolean shiftIssue;
 
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicOperationEntity.java

@@ -17,6 +17,8 @@
 
 package com.epmet.modules.topic.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;
@@ -52,4 +54,10 @@ public class ResiTopicOperationEntity extends BaseEpmetEntity {
 	 * 屏蔽理由（非必填）
 	 * */
 	private String operationReason;
+
+	/**
+	 * 客户ID
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String customerId;
 }