From 4d6f19a7372cdeda0c686122fbac831929d8d2ab Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Jun 2022 09:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=88=BF=E5=B1=8B=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=96=B0=E5=A2=9Eremark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/IcResiCollectMemFormDTO.java     | 5 +++++
 .../src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java | 4 ++--
 .../src/main/java/com/epmet/entity/IcResiCollectEntity.java  | 2 +-
 .../src/main/java/com/epmet/entity/IcResiMemberEntity.java   | 5 +++++
 .../db/migration/V0.0.54__ic_resicollect_reamrk.sql          | 2 ++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java
index 9e30557f72..7e7cb6e846 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java
+++ b/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;
+
     /**
      * 社区居民信息登记-查询返参用
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java
index 9778cb6a17..75bc3b1c69 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiCollectFormDTO.java
+++ b/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;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java
index 8b6a20d87b..3b4b8ac3e0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java
+++ b/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;
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java
index b943676543..583663a1a1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java
+++ b/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;
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.54__ic_resicollect_reamrk.sql
new file mode 100644
index 0000000000..4d12e2fca0
--- /dev/null
+++ b/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;
\ No newline at end of file