From dad584e4efa7a95ec18f37a833acfeb1f670a562 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 04 六月 2021 09:23:00 +0800
Subject: [PATCH] 网格员管理以及网格管理

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
index 1f08a03..f83d72e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java
@@ -1,5 +1,7 @@
 package com.panzhihua.common.model.dtos.community;
 
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
@@ -9,6 +11,7 @@
  *  实有人口DTO
  */
 @Data
+@EncryptQueryClass
 public class ComMngPopulationDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -66,11 +69,11 @@
      * 社区id
      */
     @ApiModelProperty(value="社区id",hidden = true)
-    private Integer actId;
+    private Long actId;
     /**
      * 小区id(实有房屋id)
      */
-    @ApiModelProperty(value="小区id(实有房屋id)",hidden = true)
+    @ApiModelProperty(value="小区id(实有房屋id)")
     private Integer villageId;
     /**
      * 家庭成员(姓名)
@@ -87,10 +90,12 @@
      */
     @ApiModelProperty(value="年龄")
     private Integer age;
+
     /**
      * 身份证号码
      */
     @ApiModelProperty(value="身份证号码")
+    @EncryptQuery
     private String cardNo;
     /**
      * 街路巷
@@ -101,7 +106,7 @@
      * 门牌号
      */
     @ApiModelProperty(value="门牌号")
-    private Integer doorNo;
+    private String doorNo;
     /**
      * 楼排号
      */
@@ -111,12 +116,12 @@
      * 单元号
      */
     @ApiModelProperty(value="单元号")
-    private Integer unitNo;
+    private String unitNo;
     /**
      * 户室(房间号)
      */
     @ApiModelProperty(value="户室(房间号)")
-    private Integer houseNo;
+    private String houseNo;
     /**
      * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)
      */

--
Gitblit v1.7.1