房屋状态改为房屋类型，成员新增remark

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java

@@ -64,6 +64,11 @@ public class IcResiCollectMemFormDTO implements Serializable {
      */
     private String workPlace;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 社区居民信息登记-查询返参用
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java

@@ -86,9 +86,9 @@ public class ResiCollectFormDTO implements Serializable {
     private String address;
 
     /**
-     * 1自有0租住
+     * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出
      */
-    @NotBlank(message = "房子属于自有还是租住？", groups = {InternalShowGroup.class})
+    @NotBlank(message = "房子状态不能为空", groups = {InternalShowGroup.class})
     private String houseType;
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java

@@ -69,7 +69,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity {
 	private String address;
 
     /**
-     * 1自由0租住
+     * 房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出
      */
 	private String houseType;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java

@@ -72,4 +72,9 @@ public class IcResiMemberEntity extends BaseEpmetEntity {
 	 * 学校或公司
 	 */
 	private String workPlace;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
 }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql

@@ -0,0 +1,2 @@
+alter table ic_resi_collect MODIFY COLUMN `HOUSE_TYPE` varchar(1) NOT NULL COMMENT '房屋状态与ic_house表的RENT_FLAG一致取值1：出租 0：自住  2：闲置 3：未售出';
+alter table ic_resi_member add COLUMN REMARK VARCHAR(512) DEFAULT '' COMMENT '备注' AFTER WORK_PLACE;