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

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

@@ -110,4 +110,6 @@ public class EditAgencyFormDTO implements Serializable {
     private String centerAddress;
 
     private String customerId;
+
+    private String remark;
 }

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

@@ -133,4 +133,8 @@ public class AgencysResultDTO implements Serializable {
      * 中心点位位置
      */
     private String centerAddress;
+
+    private String remark;
+
+    private String coordinates;
 }

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

@@ -143,4 +143,9 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 * 联系电话
 	 */
 	private String mobile;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.48__alter_agency.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `epmet_gov_org`.`customer_agency`
+    ADD COLUMN `REMARK` text NULL COMMENT '备注说明' AFTER `REVISION`;