From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 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..5e47515 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;
@@ -29,11 +32,29 @@
*/
@ApiModelProperty("年龄开始查询字段")
private String ageStart;
+
+ /**
+ * 年龄开始时间查询字段
+ */
+ @ApiModelProperty(value = "年龄开始时间查询字段",hidden = true)
+ private String ageStartTime;
+
+ /**
+ * 最终年龄开始时间查询字段
+ */
+ @ApiModelProperty(value = "最终年龄开始时间查询字段",hidden = true)
+ private String ageStartTimeEnd;
/**
* 年龄结束查询字段
*/
@ApiModelProperty("年龄结束查询字段")
private String ageEnd;
+
+ /**
+ * 年龄结束时间查询字段
+ */
+ @ApiModelProperty(value = "年龄结束时间查询字段",hidden = true)
+ private String ageEndTime;
/**
* 籍贯
@@ -66,12 +87,12 @@
* 社区id
*/
@ApiModelProperty(value="社区id",hidden = true)
- private Integer actId;
+ private Long actId;
/**
* 小区id（实有房屋id）
*/
- @ApiModelProperty(value="小区id（实有房屋id）",hidden = true)
- private Integer villageId;
+ @ApiModelProperty(value="小区id（实有房屋id）")
+ private Long villageId;
/**
* 家庭成员（姓名）
*/
@@ -87,10 +108,12 @@
*/
@ApiModelProperty(value="年龄")
private Integer age;
+
/**
* 身份证号码
*/
@ApiModelProperty(value="身份证号码")
+ @EncryptQuery
private String cardNo;
/**
* 街路巷
@@ -101,7 +124,7 @@
* 门牌号
*/
@ApiModelProperty(value="门牌号")
- private Integer doorNo;
+ private String doorNo;
/**
* 楼排号
*/
@@ -111,12 +134,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.群众)
*/
@@ -164,4 +187,19 @@
@ApiModelProperty(value="是否租住(0.否 1.是)")
private Integer isRent;
+ /**
+ * 外地or本地（1.本地 2.外地）
+ */
+ @ApiModelProperty(value="外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty(value="房屋地址等级")
+ private Integer level;
+
+ @ApiModelProperty(value="房屋id")
+ private Long houseId;
+
+ @ApiModelProperty("居住地址")
+ private String address;
+
}
--
Gitblit v1.7.1