From f7ada07fb36dc5a97c6e38981c2becafb53ab749 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 20 Apr 2020 17:23:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9customer=5Fstaff=5Fagency.o?= =?UTF-8?q?rg=5Fid=E4=B8=BAagency=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java | 4 ++-- .../main/java/com/epmet/entity/CustomerStaffAgencyEntity.java | 4 ++-- .../main/java/com/epmet/excel/CustomerStaffAgencyExcel.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java index c97e5097a1..797324673c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffAgencyDTO.java @@ -49,9 +49,9 @@ public class CustomerStaffAgencyDTO implements Serializable { private String userId; /** - * 组织机构ID customer_organization.id + * 组织机构ID customer_agency.id */ - private String orgId; + private String agencyId; /** * 删除标识 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java index 9c333137a9..f9b1d01de8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffAgencyEntity.java @@ -49,8 +49,8 @@ public class CustomerStaffAgencyEntity extends BaseEpmetEntity { private String userId; /** - * 组织机构ID customer_organization.id + * 组织机构ID customer_agency.id */ - private String orgId; + private String agencyId; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffAgencyExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffAgencyExcel.java index a870073498..55abe860f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffAgencyExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffAgencyExcel.java @@ -40,8 +40,8 @@ public class CustomerStaffAgencyExcel { @Excel(name = "用户ID") private String userId; - @Excel(name = "组织机构ID customer_organization.id") - private String orgId; + @Excel(name = "组织机构ID customer_agency.id") + private String agencyId; @Excel(name = "删除标识") private Integer delFlag;