From ffcd3e31c9938eb256d616c80edbe1821e9fb2bf Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 02 七月 2021 16:15:34 +0800
Subject: [PATCH] 综治后台小区模块接口

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 1121fdf..64b8d60 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,6 @@
 package com.panzhihua.common.model.vos.community;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
 import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -74,7 +75,7 @@
 
     @ApiModelProperty("门牌号")
     @NotBlank(groups = {AddGroup.class},message = "门牌号不可为空")
-    private Integer doorNo;
+    private String doorNo;
 
     @ApiModelProperty("楼排号")
     @NotBlank(groups = {AddGroup.class},message = "楼排号不可为空")
@@ -82,11 +83,11 @@
 
     @ApiModelProperty("单元号")
     @NotBlank(groups = {AddGroup.class},message = "单元号不可为空")
-    private Integer unitNo;
+    private String unitNo;
 
     @ApiModelProperty("户室(房间号)")
     @NotBlank(groups = {AddGroup.class},message = "户室(房间号)不可为空")
-    private Integer houseNo;
+    private String houseNo;
 
     @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
     @NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空")
@@ -111,13 +112,18 @@
     private String label;
 
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAt;
 
     @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateAt;
 
     @ApiModelProperty("籍贯")
     private String nativePlace;
+
+    @ApiModelProperty("民族")
+    private String nationCode;
 
     @ApiModelProperty("民族")
     private String nation;
@@ -153,6 +159,11 @@
     @ApiModelProperty("户口所在地")
     private String censusRegister;
 
+    /**
+     * 居住地址
+     */
+    private String address;
+
     @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
     private Integer relation;
 

--
Gitblit v1.7.1