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

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

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

@@ -79,6 +79,8 @@ public class IcHouseListResultDTO implements Serializable {
      */
     private String ownerIdCard;
 
+    private String remark;
+
     private Double sort;
     private String remark;
 

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

@@ -113,7 +113,7 @@
         c.GRID_ID as gridId,
         gr.GRID_NAME,
         IFNULL(a.sort,0) as sort,
-        a.REMARK as remark
+        IFNULL(a.REMARK,'') AS remark
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'