From f6b40bb7bf245e663d7effdadfc2261178b70781 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 15 Jan 2021 17:12:42 +0800 Subject: [PATCH 1/2] tree --- .../service/evaluationindex/screen/impl/AgencyServiceImpl.java | 2 +- .../src/main/java/com/epmet/constant/AreaCodeConstant.java | 2 ++ .../main/java/com/epmet/service/impl/AreaCodeServiceImpl.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 880e07f357..5c720eee42 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -241,7 +241,7 @@ public class AgencyServiceImpl implements AgencyService { public List areaCodeDictTree(AreaCodeDictFormDTO formDTO) { Result> listResult = commonServiceOpenFeignClient.areaCodeDictTree(formDTO); if (!listResult.success()){ - throw new RenException(ScreenConstant.GET_AREA_TREE_FAILURE); + throw new RenException(listResult.getInternalMsg()); } if (!CollectionUtils.isEmpty(listResult.getData())){ return listResult.getData(); diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java index 742c73993a..3ee44fec5f 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java @@ -24,4 +24,6 @@ public interface AreaCodeConstant { String ROOT_AGENCY_LEVEL_IS_LEVEL = "RootAreaLevel为空......"; + String LEVEL_ERROR = "RootAreaLevel填写错误【%s】"; + } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java index 7898516b33..b511cab2c0 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java @@ -313,6 +313,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl Date: Mon, 18 Jan 2021 10:19:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?role=5Foperation=E3=80=81role=5Fscope?= =?UTF-8?q?=E3=80=81customer=5Fhome=5Fdetail=E3=80=81project=5Forg=5Frelat?= =?UTF-8?q?ion=E3=80=81project=5Frelated=5Fpersonnel=E3=80=81staff=5Fwecha?= =?UTF-8?q?t=E3=80=81user=E3=80=81staff=5Frole=E3=80=81user=5Fwechat=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7ID=20=20=E5=AF=B9=E5=BA=94s?= =?UTF-8?q?ql=E8=84=9A=E6=9C=AC=E8=BF=98=E6=9C=AA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java | 5 +++++ .../com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java | 5 +++++ .../main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java | 5 +++++ .../com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java | 5 +++++ .../dataaggre/dto/govproject/ProjectOrgRelationDTO.java | 5 +++++ .../dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java | 5 +++++ .../epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java | 5 +++++ .../epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java | 5 +++++ .../com/epmet/dataaggre/entity/epmetuser/UserEntity.java | 5 +++++ .../epmet/dataaggre/entity/epmetuser/UserWechatEntity.java | 5 +++++ .../entity/govproject/ProjectOrgRelationEntity.java | 5 +++++ .../entity/govproject/ProjectRelatedPersonnelEntity.java | 5 +++++ .../src/main/java/com/epmet/dto/RoleOperationDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/RoleScopeDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/RoleOperationEntity.java | 5 +++++ .../src/main/java/com/epmet/entity/RoleScopeEntity.java | 5 +++++ .../src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java | 5 +++++ .../main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java | 5 +++++ .../main/java/com/epmet/entity/ProjectOrgRelationEntity.java | 5 +++++ .../java/com/epmet/entity/ProjectRelatedPersonnelEntity.java | 5 +++++ .../src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java | 5 +++++ .../main/java/com/epmet/entity/CustomerHomeDetailEntity.java | 5 +++++ .../src/main/java/com/epmet/dto/StaffRoleDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/StaffWechatDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/UserDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/StaffRoleEntity.java | 5 +++++ .../src/main/java/com/epmet/entity/StaffWechatEntity.java | 5 +++++ .../src/main/java/com/epmet/entity/UserEntity.java | 5 ++++- .../src/main/java/com/epmet/entity/UserWechatEntity.java | 5 +++++ 29 files changed, 144 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java index 472615f6b1..fee3786630 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffRoleDTO.java @@ -83,4 +83,9 @@ public class StaffRoleDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java index b129857f74..b5afb3476d 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffWechatDTO.java @@ -123,4 +123,9 @@ public class StaffWechatDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java index 6d79de576b..f8596020d1 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserDTO.java @@ -78,4 +78,9 @@ public class UserDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java index 6ddad76885..6731f94132 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/UserWechatDTO.java @@ -123,4 +123,9 @@ public class UserWechatDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectOrgRelationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectOrgRelationDTO.java index 917aee0760..8540d12b56 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectOrgRelationDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectOrgRelationDTO.java @@ -111,4 +111,9 @@ public class ProjectOrgRelationDTO implements Serializable { */ private String updatedBy; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java index 87ed6f6173..b8332124ec 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/ProjectRelatedPersonnelDTO.java @@ -98,4 +98,9 @@ public class ProjectRelatedPersonnelDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java index c8a27e515f..9cfbbe1ea8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffRoleEntity.java @@ -53,4 +53,9 @@ public class StaffRoleEntity extends BaseEpmetEntity { */ private String orgId; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java index 33771a607f..b4085694fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffWechatEntity.java @@ -93,4 +93,9 @@ public class StaffWechatEntity extends BaseEpmetEntity { */ private String language; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java index fbec7cb293..f58f84e9c7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserEntity.java @@ -48,4 +48,9 @@ public class UserEntity extends BaseEpmetEntity { */ private String fromClient; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java index b319057238..30cab00c14 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/UserWechatEntity.java @@ -93,4 +93,9 @@ public class UserWechatEntity extends BaseEpmetEntity { */ private String language; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java index 975d2282a0..247d85b928 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectOrgRelationEntity.java @@ -80,4 +80,9 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity { */ private String operation; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java index 95259997cf..c77447baa6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govproject/ProjectRelatedPersonnelEntity.java @@ -68,4 +68,9 @@ public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity { */ private String userId; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java index bda4931386..d658ebcb34 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleOperationDTO.java @@ -79,4 +79,9 @@ public class RoleOperationDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java index 17f8866215..2ac1638384 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/RoleScopeDTO.java @@ -83,4 +83,9 @@ public class RoleScopeDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java index 96f70de1be..c6d5243f1a 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationEntity.java @@ -48,4 +48,9 @@ public class RoleOperationEntity extends BaseEpmetEntity { */ private String operationKey; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java index 2c3c6f21dc..88da4a22f6 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleScopeEntity.java @@ -53,4 +53,9 @@ public class RoleScopeEntity extends BaseEpmetEntity { */ private String scopeKey; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java index a092793cf2..2bbe26cc3a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java @@ -110,4 +110,9 @@ public class ProjectOrgRelationDTO implements Serializable { */ private String updatedBy; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java index 4ac72f72cc..55bbe13d02 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectRelatedPersonnelDTO.java @@ -98,4 +98,9 @@ public class ProjectRelatedPersonnelDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java index 23e190ab90..ef504461c9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectOrgRelationEntity.java @@ -80,4 +80,9 @@ public class ProjectOrgRelationEntity extends BaseEpmetEntity { */ private String operation; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java index 6b99f72f4a..e4b12243b7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectRelatedPersonnelEntity.java @@ -68,4 +68,9 @@ public class ProjectRelatedPersonnelEntity extends BaseEpmetEntity { */ private String sourceId; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java index 82f5b1d9ce..1081a4e145 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomerHomeDetailDTO.java @@ -93,4 +93,9 @@ public class CustomerHomeDetailDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java index e6a753278b..b804a3be7b 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/CustomerHomeDetailEntity.java @@ -68,4 +68,9 @@ public class CustomerHomeDetailEntity extends BaseEpmetEntity { */ private Integer displayOrder; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java index 59d649f970..753bc36884 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffRoleDTO.java @@ -83,4 +83,9 @@ public class StaffRoleDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffWechatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffWechatDTO.java index 905ab9e741..b60ce23bbe 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffWechatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/StaffWechatDTO.java @@ -124,4 +124,9 @@ public class StaffWechatDTO implements Serializable { */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java index ab7f652268..e8dd099611 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserDTO.java @@ -63,4 +63,9 @@ public class UserDTO implements Serializable{ */ private Date updatedTime; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java index 20f828a52d..c9c12afea9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffRoleEntity.java @@ -53,4 +53,9 @@ public class StaffRoleEntity extends BaseEpmetEntity { */ private String orgId; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffWechatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffWechatEntity.java index d2ebd5c411..5b490a9555 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffWechatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StaffWechatEntity.java @@ -90,4 +90,9 @@ public class StaffWechatEntity extends BaseEpmetEntity { */ private String language; + /** + * 客户ID + */ + private String customerId; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java index 47c11d3a60..b034dc8c3e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserEntity.java @@ -29,6 +29,9 @@ public class UserEntity extends BaseEpmetEntity { * */ private String fromClient; - + /** + * 客户ID + */ + private String customerId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java index 218d7a879d..8b05ffbf97 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserWechatEntity.java @@ -74,5 +74,10 @@ public class UserWechatEntity extends BaseEpmetEntity { */ private String language; + /** + * 客户ID + */ + private String customerId; + }