组织机构表字段修改（国家改为区县）

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java

@@ -112,11 +112,6 @@ public class CustomerAgencyDTO implements Serializable {
      */
 	private Integer totalUser;
 
-    /**
-     * 国家
-     */
-	private String country;
-
     /**
      * 省份
      */
@@ -126,5 +121,10 @@ public class CustomerAgencyDTO implements Serializable {
      * 城市
      */
 	private String city;
+	
+    /**
+     * 区县
+     */
+    private String district;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java

@@ -82,11 +82,6 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
      */
 	private Integer totalUser;
 
-	/**
-	 * 国家
-	 */
-	private String country;
-
 	/**
 	 * 省份
 	 */
@@ -97,4 +92,9 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String city;
 
+	/**
+	 * 区县
+	 */
+	private String district;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java

@@ -76,14 +76,12 @@ public class CustomerAgencyExcel {
     @Excel(name = "总人数")
     private Integer totalUser;
 
-    @Excel(name = "国家")
-    private String country;
-
     @Excel(name = "省份")
     private String province;
 
     @Excel(name = "城市")
     private String city;
 
-
+    @Excel(name = "区县")
+    private String district;
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql

@@ -107,7 +107,7 @@ alter table customer_grid add column ORG_ID varchar(64) NOT NULL COMMENT '所属
 alter table customer_grid add column MANAGE_DISTRICT varchar(255) DEFAULT "" NOT NULL COMMENT '管辖区域';
 alter table customer_grid add column TOTAL_USER INT(11) DEFAULT 0 NOT NULL COMMENT '当前网格总人数';
 ALTER TABLE customer_agency ADD (
-	COUNTRY VARCHAR (32) DEFAULT NULL COMMENT '国家',
 	PROVINCE VARCHAR (32) DEFAULT NULL COMMENT '省份',
-	CITY VARCHAR (32) DEFAULT NULL COMMENT '城市'
+	CITY VARCHAR (32) DEFAULT NULL COMMENT '城市',
+	DISTRICT VARCHAR (32) DEFAULT NULL COMMENT '区县'
 );