Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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

@@ -38,6 +38,8 @@ public class AllMattersResultDTO implements Serializable {
 
     private String workPhone;
 
+    private String centerName;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";
@@ -45,5 +47,6 @@ public class AllMattersResultDTO implements Serializable {
         this.matterImg = "";
         this.address = "";
         this.workPhone = "";
+        this.centerName = "";
     }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml

@@ -63,7 +63,8 @@
                  ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime,
             IFNULL(cm.MATTER_IMG,'') AS matterImg,
             c.ADDRESS,
-            c.WORK_PHONE
+            c.WORK_PHONE,
+            c.CENTER_NAME
         FROM ic_party_service_center c
         INNER JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = c.ID AND cm.DEL_FLAG = 0)
             AND c.DEL_FLAG = 0