From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java | 94 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java
index 3ee92b4..e3f726f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationDetailVO.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,88 +15,89 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("居民详情返回参数")
@EncryptDecryptClass
public class PopulationDetailVO {
@ApiModelProperty(value = "主键ID")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
@ApiModelProperty(value = "姓名")
- private String name;
+ private String name;
@ApiModelProperty(value = "手机号")
- @EncryptDecryptField
- private String phone;
+ @EncryptDecryptField
+ private String phone;
- @ApiModelProperty(value = "身份证号码")
- @EncryptDecryptField
+ @ApiModelProperty(value = "身份证号码")
+ @EncryptDecryptField
private String cardNo;
@ApiModelProperty(value = "标签")
- private String label;
+ private String label;
- @ApiModelProperty(value = "居住地址")
- private String address;
+ @ApiModelProperty(value = "居住地址")
+ private String address;
@ApiModelProperty(value = "民族")
- private String nation;
+ private String nation;
- @ApiModelProperty(value = "年龄")
- private Integer age;
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
- @ApiModelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
- private Integer politicalOutlook;
+ @ApiModelProperty(
+ value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
+ private Integer politicalOutlook;
@ApiModelProperty(value = "性别（1.男 2.女）")
- private String sex;
+ private String sex;
- @ApiModelProperty(value = "出生年月")
+ @ApiModelProperty(value = "出生年月")
private String birthday;
- @ApiModelProperty(value = "籍贯")
- private String nativePlace;
+ @ApiModelProperty(value = "籍贯")
+ private String nativePlace;
- @ApiModelProperty(value = "婚姻状况")
- private String marriage;
+ @ApiModelProperty(value = "婚姻状况")
+ private String marriage;
- @ApiModelProperty(value = "文化程度")
- private String cultureLevel;
+ @ApiModelProperty(value = "文化程度")
+ private String cultureLevel;
- @ApiModelProperty(value = "健康状况")
- private String healthy;
+ @ApiModelProperty(value = "健康状况")
+ private String healthy;
- @ApiModelProperty(value = "是否租住(0.否 1.是)")
- private Integer isRent;
+ @ApiModelProperty(value = "是否租住(0.否 1.是)")
+ private Integer isRent;
- @ApiModelProperty("街路巷")
- private String road;
+ @ApiModelProperty("街路巷")
+ private String road;
- @ApiModelProperty("门牌号")
- private String doorNo;
+ @ApiModelProperty("门牌号")
+ private String doorNo;
- @ApiModelProperty("楼排号")
- private String floor;
+ @ApiModelProperty("楼排号")
+ private String floor;
- @ApiModelProperty("单元号")
- private String unitNo;
+ @ApiModelProperty("单元号")
+ private String unitNo;
- @ApiModelProperty("户室（房间号）")
- private String houseNo;
+ @ApiModelProperty("户室（房间号）")
+ private String houseNo;
- @ApiModelProperty("工作单位")
- private String workCompany;
+ @ApiModelProperty("工作单位")
+ private String workCompany;
- @ApiModelProperty("户口所在地")
- private String censusRegister;
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
- @ApiModelProperty("外地or本地（1.本地 2.外地）")
- private Integer outOrLocal;
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
- @ApiModelProperty("备注")
- private String remark;
+ @ApiModelProperty("备注")
+ private String remark;
}
--
Gitblit v1.7.1