From c7c2ce05be0de7dcf733d927b1562af38f72992b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 23 Apr 2020 09:53:08 +0800
Subject: [PATCH] =?UTF-8?q?customer=5Fagency=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94=E5=AE=9E=E4=BD=93=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/CustomerAgencyDTO.java     | 15 +++++++++++++++
 .../com/epmet/entity/CustomerAgencyEntity.java    | 15 +++++++++++++++
 .../java/com/epmet/excel/CustomerAgencyExcel.java |  9 +++++++++
 3 files changed, 39 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java
index 9523753483..d1e6c3f40a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java
@@ -112,4 +112,19 @@ public class CustomerAgencyDTO implements Serializable {
      */
 	private Integer totalUser;
 
+    /**
+     * 国家
+     */
+	private String country;
+
+    /**
+     * 省份
+     */
+	private String province;
+
+    /**
+     * 城市
+     */
+	private String city;
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
index b06e833347..84f0e78f1c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
@@ -82,4 +82,19 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
      */
 	private Integer totalUser;
 
+	/**
+	 * 国家
+	 */
+	private String country;
+
+	/**
+	 * 省份
+	 */
+	private String province;
+
+	/**
+	 * 城市
+	 */
+	private String city;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java
index 27422f3157..61ea84eb40 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java
@@ -76,5 +76,14 @@ public class CustomerAgencyExcel {
     @Excel(name = "总人数")
     private Integer totalUser;
 
+    @Excel(name = "国家")
+    private String country;
+
+    @Excel(name = "省份")
+    private String province;
+
+    @Excel(name = "城市")
+    private String city;
+
 
 }
\ No newline at end of file