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

@@ -34,10 +34,16 @@ public class AllMattersResultDTO implements Serializable {
      */
     private String matterImg;
 
+    private String address;
+
+    private String workPhone;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";
         this.matterId = "";
         this.matterImg = "";
+        this.address = "";
+        this.workPhone = "";
     }
 }

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

@@ -61,7 +61,9 @@
                  when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
                  when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
                  ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime,
-            IFNULL(cm.MATTER_IMG,'') AS matterImg
+            IFNULL(cm.MATTER_IMG,'') AS matterImg,
+            c.ADDRESS,
+            c.WORK_PHONE
         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