From 575e94e9db7e507ecec2441d24a13e9415fd9f03 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 19 五月 2021 19:56:05 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 25bbaed..719240a 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,7 +69,7 @@
* 社区id
*/
@ApiModelProperty(value="社区id",hidden = true)
- private Integer actId;
+ private Long actId;
/**
* 小区id（实有房屋id）
*/
@@ -87,10 +90,12 @@
*/
@ApiModelProperty(value="年龄")
private Integer age;
+
/**
* 身份证号码
*/
@ApiModelProperty(value="身份证号码")
+ @EncryptQuery
private String cardNo;
/**
* 街路巷
@@ -158,4 +163,10 @@
@ApiModelProperty(value="修改时间")
private Date updateAt;
+ /**
+ * 是否租住(0.否 1.是)
+ */
+ @ApiModelProperty(value="是否租住(0.否 1.是)")
+ private Integer isRent;
+
}
--
Gitblit v1.7.1