Browse Source

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

dev_shibei_match
sunyuchao 5 years ago
parent
commit
ee64fe1f5a
  1. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupInvitationDTO.java
  2. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupMemeberOperationDTO.java
  3. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/InvitationAccessRecordDTO.java
  4. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupMemberDTO.java
  5. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupOperationDTO.java
  6. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupStatisticalDTO.java
  7. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicAttachmentDTO.java
  8. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicCommentDTO.java
  9. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicDTO.java
  10. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicOperationDTO.java
  11. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupInvitationEntity.java
  12. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupMemeberOperationEntity.java
  13. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/InvitationAccessRecordEntity.java
  14. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupMemberEntity.java
  15. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupOperationEntity.java
  16. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupStatisticalEntity.java
  17. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicAttachmentEntity.java
  18. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicCommentEntity.java
  19. 7
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicEntity.java
  20. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicOperationEntity.java

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupInvitationDTO.java

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

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/GroupMemeberOperationDTO.java

@ -111,4 +111,9 @@ Ps: 1) 入群被拒绝之后,如果再申请是插入一条新的审核中的
*/
private Date updatedTime;
/**
* 客户ID
*/
private String customerId;
}

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/InvitationAccessRecordDTO.java

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

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupMemberDTO.java

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

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupOperationDTO.java

@ -98,4 +98,9 @@ public class ResiGroupOperationDTO implements Serializable {
*/
private String messageText;
/**
* 客户ID
*/
private String customerId;
}

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiGroupStatisticalDTO.java

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

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicAttachmentDTO.java

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

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicCommentDTO.java

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

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicDTO.java

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

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/ResiTopicOperationDTO.java

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

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupInvitationEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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 Date validEndTime;
/**
* 客户ID
*/
@TableField(fill = FieldFill.INSERT)
private String customerId;
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/GroupMemeberOperationEntity.java

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

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/InvitationAccessRecordEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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 InvitationAccessRecordEntity extends BaseEpmetEntity {
*/
private String state;
/**
* 客户ID
*/
@TableField(fill = FieldFill.INSERT)
private String customerId;
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupMemberEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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;
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupOperationEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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 ResiGroupOperationEntity extends BaseEpmetEntity {
*/
private String messageText;
/**
* 客户ID
*/
@TableField(fill = FieldFill.INSERT)
private String customerId;
}

7
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiGroupStatisticalEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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 ResiGroupStatisticalEntity extends BaseEpmetEntity {
*/
private Integer totalNormalMemebers;
/**
* 客户ID
*/
@TableField(fill = FieldFill.INSERT)
private String customerId;
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicAttachmentEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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 ResiTopicAttachmentEntity extends BaseEpmetEntity {
*/
private Integer duration;
/**
* 客户ID
*/
@TableField(fill = FieldFill.INSERT)
private String customerId;
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicCommentEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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;
}

7
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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,9 @@ public class ResiTopicEntity extends BaseEpmetEntity {
*/
private String issueId;
/**
* 客户ID
*/
@TableField(fill = FieldFill.INSERT)
private String customerId;
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/ResiTopicOperationEntity.java

@ -17,6 +17,8 @@
package com.epmet.dataaggre.entity.resigroup;
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 ResiTopicOperationEntity extends BaseEpmetEntity {
*/
private String operationReason;
/**
* 客户ID
*/
@TableField(fill = FieldFill.INSERT)
private String customerId;
}

Loading…
Cancel
Save