houseType、heSuanCount=》String

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})
+    @NotBlank(message = "房子属于自由还是组织？", groups = {InternalShowGroup.class, ExternalShowGroup.class})
-    private Integer houseType;
+    private String houseType;
 
     /**
      * 户主姓名

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未接种；

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;
 
     /**
      * 户主姓名

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未接种；