From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index bfde4ee..ffcd7e4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -1,5 +1,10 @@
package com.panzhihua.common.model.vos.community;
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -12,13 +17,10 @@
import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import java.util.List;
/**
* 实有人口Vo
@@ -54,19 +56,19 @@
* 家庭成员（姓名）
*/
@ApiModelProperty("家庭成员（姓名）")
- @NotBlank(groups = {AddGroup.class},message = "家庭成员（姓名）不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "家庭成员（姓名）不可为空")
private String name;
@ApiModelProperty("性别（1.男 2.女 3.未知）")
- @NotBlank(groups = {AddGroup.class},message = "性别不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
private Integer sex;
@ApiModelProperty("年龄")
- @NotBlank(groups = {AddGroup.class},message = "年龄不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
private Integer age;
@ApiModelProperty("身份证号码")
- @NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号码不可为空")
@EncryptDecryptField
private String cardNo;
@@ -74,27 +76,27 @@
private String birthday;
@ApiModelProperty("街路巷")
- @NotBlank(groups = {AddGroup.class},message = "街路巷不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
private String road;
@ApiModelProperty("门牌号")
- @NotBlank(groups = {AddGroup.class},message = "门牌号不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
private String doorNo;
@ApiModelProperty("楼排号")
- @NotBlank(groups = {AddGroup.class},message = "楼排号不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
private String floor;
@ApiModelProperty("单元号")
- @NotBlank(groups = {AddGroup.class},message = "单元号不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
private String unitNo;
@ApiModelProperty("户室（房间号）")
- @NotBlank(groups = {AddGroup.class},message = "户室（房间号）不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "户室（房间号）不可为空")
private String houseNo;
@ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
- @NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "政治面貌不可为空")
private Integer politicalOutlook;
@ApiModelProperty("政治面貌名称")
@@ -107,7 +109,7 @@
private String specialSituation;
@ApiModelProperty("联系方式")
- @NotBlank(groups = {AddGroup.class},message = "联系方式不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "联系方式不可为空")
@EncryptDecryptField
@Sensitive(strategy = SensitiveStrategy.PHONE)
private String phone;
@@ -148,7 +150,7 @@
private UserElectronicFileVO userElectronicFileVO;
@ApiModelProperty("是否租住 是否租住(0.否 1.是)")
- @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
+ @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
private Integer isRent;
@ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
@@ -220,7 +222,7 @@
@ApiModelProperty("低保户信息")
private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;
- public interface sex{
+ public interface sex {
int nan = 1;
int nv = 2;
int no = 3;
@@ -229,7 +231,7 @@
/**
* 是否租住
*/
- public interface isOk{
+ public interface isOk {
int yes = 1;
int no = 0;
}
@@ -237,7 +239,7 @@
/**
* 政治面貌
*/
- public interface politicalOutlook{
+ public interface politicalOutlook {
int dang = 1;
int tuan = 3;
int wu = 12;
--
Gitblit v1.7.1