From 8e01db3f11000b78006337698e57c28bfdfd5f81 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 18 Mar 2022 20:58:33 +0800
Subject: [PATCH] =?UTF-8?q?houseType=E3=80=81heSuanCount=3D=E3=80=8BString?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/IcResiCollectFormDTO.java    | 4 ++--
 .../main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java | 2 +-
 .../src/main/java/com/epmet/entity/IcResiCollectEntity.java   | 2 +-
 .../src/main/java/com/epmet/entity/IcResiMemberEntity.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java
index c6d45ed0da..21f2244129 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java
@@ -84,8 +84,8 @@ public class IcResiCollectFormDTO implements Serializable {
     /**
      * 1自由0租住
      */
-    @NotNull(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class})
-    private Integer houseType;
+    @NotBlank(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class})
+    private String houseType;
 
     /**
      * 户主姓名
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 9778aacb4f..7d6d1743af 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
@@ -28,7 +28,7 @@ public class IcResiCollectMemFormDTO implements Serializable {
     /**
      * 居住成员1是否参加几轮全员核算检测，数字1-10
      */
-    private Integer heSuanCount;
+    private String heSuanCount;
 
     /**
      * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；
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 ccdbb77325..1123bca8b8 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
@@ -71,7 +71,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity {
     /**
      * 1自由0租住
      */
-	private Integer houseType;
+	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 28ee2c49e4..399ce07822 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
@@ -46,7 +46,7 @@ public class IcResiMemberEntity extends BaseEpmetEntity {
     /**
      * 居住成员1是否参加几轮全员核算检测，数字1-10
      */
-	private Integer heSuanCount;
+	private String heSuanCount;
 
     /**
      * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；