Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java

@@ -39,6 +39,11 @@ public class CollectListResultDTO implements Serializable {
      */
     private Integer totalResi;
 
+    /**
+     * 所属家庭Id
+     */
+    private String homeId;
+
     private String domicilePlace;
 
     private List<CollectListMemberResultDTO> list;

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@@ -16,6 +16,7 @@
         <result property="address" column="address"/>
         <result property="houseType" column="houseType"/>
         <result property="totalResi" column="totalResi"/>
+        <result property="homeId" column="homeId"/>
         <result property="domicilePlace" column="domicilePlace"></result>
         <collection property="list" ofType="com.epmet.dto.result.CollectListResultDTO$CollectListMemberResultDTO" column="{id=id,domicilePlace=domicile_place}" select="selectMemberList"/>
     </resultMap>
@@ -26,6 +27,7 @@
             c.ADDRESS AS address,
             c.HOUSE_TYPE AS houseType,
             c.TOTAL_RESI AS totalResi,
+            c.HOME_ID as homeId,
             #{domicilePlace} as domicile_place
         FROM ic_resi_collect c
         left join ic_resi_member m on(c.id=m.IC_RESI_COLLECT_ID and m.del_flag='0')