From 793cec8d684184d191ef908d55e381247b874a48 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 19 Mar 2022 13:59:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=90=E5=91=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/IcResiCollectMemFormDTO.java    | 6 ++++++
 1 file changed, 6 insertions(+)

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 7d6d1743af..ec40590451 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
@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
@@ -13,25 +14,30 @@ public class IcResiCollectMemFormDTO implements Serializable {
     /**
      * 居住成员1姓名
      */
+    @NotBlank(message = "姓名", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String name;
 
     /**
      * 居住成员1身份证号
      */
+    @NotBlank(message = "身份证号", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String idNum;
 
     /**
      * 居住成员1手机号
      */
+    @NotBlank(message = "手机号", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String mobile;
 
     /**
      * 居住成员1是否参加几轮全员核算检测，数字1-10
      */
+    @NotBlank(message = "核算检测情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String heSuanCount;
 
     /**
      * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；
      */
+    @NotBlank(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private Integer ymjz;
 }

From 6f091f414c28ff4b06b528d60eaa7d2bee8f2b0f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 19 Mar 2022 14:05:50 +0800
Subject: [PATCH 2/3] notnull

---
 .../main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ec40590451..5285b29d8b 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
@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -38,6 +39,6 @@ public class IcResiCollectMemFormDTO implements Serializable {
     /**
      * 居住成员1新冠疫苗接种情况;1:已全程接种；2：未全程接种；0未接种；
      */
-    @NotBlank(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private Integer ymjz;
 }

From 014aff5953ad56decc8370620acc9a0bf3493ddf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 19 Mar 2022 14:11:09 +0800
Subject: [PATCH 3/3] 1

---
 .../java/com/epmet/dto/form/IcResiCollectMemFormDTO.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 5285b29d8b..4490b9357c 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
@@ -15,19 +15,19 @@ public class IcResiCollectMemFormDTO implements Serializable {
     /**
      * 居住成员1姓名
      */
-    @NotBlank(message = "姓名", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    @NotBlank(message = "姓名不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String name;
 
     /**
      * 居住成员1身份证号
      */
-    @NotBlank(message = "身份证号", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    @NotBlank(message = "身份证号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String idNum;
 
     /**
      * 居住成员1手机号
      */
-    @NotBlank(message = "手机号", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
+    @NotBlank(message = "手机号不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class})
     private String mobile;
 
     /**