From a18634e047b46e411dac268a0b3a995c22053ea5 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 06 九月 2021 09:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
index c7e8ae4..a3fb505 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
@@ -1,17 +1,16 @@
package com.panzhihua.common.model.dtos.community;
+import java.io.Serializable;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import com.panzhihua.common.model.helper.sensitive.Sensitive;
-import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
-import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.List;
/**
* 实有人口编辑请求参数
@@ -24,44 +23,44 @@
private Long id;
@ApiModelProperty("姓名")
- @NotBlank(groups = {PutGroup.class},message = "姓名不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "姓名不可为空")
private String name;
@ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
- @NotBlank(groups = {PutGroup.class},message = "政治面貌不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "政治面貌不可为空")
private Integer politicalOutlook;
@ApiModelProperty("是否租住 是否租住(0.否 1.是)")
- @NotBlank(groups = {PutGroup.class},message = "是否租住不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "是否租住不可为空")
private Integer isRent;
@ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
- @NotBlank(groups = {PutGroup.class},message = "与户主关系不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "与户主关系不可为空")
private Integer relation;
@ApiModelProperty("联系方式")
- @NotBlank(groups = {PutGroup.class},message = "联系方式不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "联系方式不可为空")
@EncryptDecryptField
private String phone;
@ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
- @NotBlank(groups = {PutGroup.class},message = "文化程度不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "文化程度不可为空")
private Integer cultureLevel;
@ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
- @NotBlank(groups = {PutGroup.class},message = "婚姻状况不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "婚姻状况不可为空")
private Integer marriage;
@ApiModelProperty("工作单位")
- @NotBlank(groups = {PutGroup.class},message = "工作单位不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "工作单位不可为空")
private String workCompany;
@ApiModelProperty("外地or本地（1.本地 2.外地）")
- @NotBlank(groups = {PutGroup.class},message = "外地/本地不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "外地/本地不可为空")
private Integer outOrLocal;
@ApiModelProperty("户口所在地")
- @NotBlank(groups = {PutGroup.class},message = "户口所在地不可为空")
+ @NotBlank(groups = {PutGroup.class}, message = "户口所在地不可为空")
private String censusRegister;
@ApiModelProperty("备注")
@@ -70,6 +69,9 @@
@ApiModelProperty("标签集合（多个标签以,隔开,如物业工作人员,物业")
private String label;
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
@ApiModelProperty("房屋信息请求参数")
private List<ComMngPopulationHouseEditDTO> houseEditDTOList;
--
Gitblit v1.7.1