Merge branch '陈航-留守老人-实体修改' of sckj/mz-cloud into master

ruoyi-modules/mz-business-lrgl/src/main/java/com/ruoyi/business/domain/ZwywLrJbxx.java

@@ -241,7 +241,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 生活状况 */
 //    @Excel(name = "生活状况")
     @ApiModelProperty(value = "生活状况")
-    @NotBlank(message = "{生活状况}")
+    @NotBlank(message = "{生活状况}",groups = AddGroup.class)
     @DictV(type = "CZ027", isMuti = true, message = "{生活状况}")
     private String lrJjzk;
 
@@ -312,7 +312,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 健康状况 */
 //    @Excel(name = "健康状况")
     @ApiModelProperty(value = "健康状况", required = true)
-    @NotBlank(message = "{健康状况}")
+    @NotBlank(message = "{健康状况}",groups = AddGroup.class)
     @DictV(type = "XZ015", isMuti = true, message = "{健康状况}")
     private String lrJkzk;
 
@@ -330,14 +330,14 @@ public class ZwywLrJbxx extends BaseEntity
 
     /** 能力状况 */
 //    @Excel(name = "能力状况")
-    @NotBlank(message = "{能力状况}")
+    @NotBlank(message = "{能力状况}",groups = AddGroup.class)
     @ApiModelProperty(value = "能力状况")
     @DictV(type = "CH050",message = "{能力状况}")
     private String lrNlzk;
 
     /** 收入来源 */
 //    @Excel(name = "收入来源")
-    @NotBlank(message = "{收入来源}")
+    @NotBlank(message = "{收入来源}",groups = AddGroup.class)
     @ApiModelProperty(value = "收入来源")
     @DictV(type = "CH054", isMuti = true, message = "{收入来源}")
     private String lrSrly;
@@ -351,7 +351,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 上年度可支配收入 */
 //    @Excel(name = "上年度可支配收入")
     @ApiModelProperty(value = "上年度可支配收入")
-    @NotBlank(message = "{上年度可支配收入}")
+    @NotBlank(message = "{上年度可支配收入}",groups = AddGroup.class)
     @DictV(type = "XZ014", message = "{上年度可支配收入}")
     private String lrKzpsr;
 
@@ -364,7 +364,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 家庭救助帮扶 */
 //    @Excel(name = "家庭救助帮扶")
     @ApiModelProperty(value = "家庭救助帮扶")
-    @NotBlank(message = "{家庭救助帮扶}")
+    @NotBlank(message = "{家庭救助帮扶}",groups = AddGroup.class)
     @DictV(type = "CH058", isMuti = true, message = "{家庭救助帮扶}")
     private String lrJtjzbfqk;
 
@@ -377,7 +377,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 陪伴居住情况 */
 //    @Excel(name = "陪伴居住情况")
     @ApiModelProperty(value = "陪伴居住情况")
-    @NotBlank(message = "{陪伴居住情况}")
+    @NotBlank(message = "{陪伴居住情况}",groups = AddGroup.class)
     @DictV(type = "CH057",isMuti = true, message = "{陪伴居住情况}")
     private String lrPbjjqk;
 
@@ -390,7 +390,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 日常生活照料人 */
 //    @Excel(name = "日常生活照料人")
     @ApiModelProperty(value = "日常生活照料人")
-    @NotBlank(message = "{日常生活照料人}")
+    @NotBlank(message = "{日常生活照料人}",groups = AddGroup.class)
     @DictV(type = "CH056", isMuti = true, message = "{日常生活照料人}")
     private String zlrLb;
 
@@ -423,7 +423,7 @@ public class ZwywLrJbxx extends BaseEntity
     /** 关爱服务需求 */
 //    @Excel(name = "关爱服务需求")
     @ApiModelProperty(value = "关爱服务需求")
-    @NotBlank(message = "{关爱服务需求}")
+    @NotBlank(message = "{关爱服务需求}",groups = AddGroup.class)
     @DictV(type = "CH055", isMuti = true, message = "{关爱服务需求}")
     private String lrGaxq;