From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 1a107a9..feda4dd 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
@@ -218,6 +218,15 @@
@ApiModelProperty("等级是否查询全部（1.是 2.否）")
private Integer levelIsAll;
+ @ApiModelProperty("是否死亡人员 (1.是 0.否)")
+ private Integer isDeath;
+
+ @ApiModelProperty("人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）")
+ private String personType;
+
+ private Integer type;
+
+ private String searchKey;
public interface levelIsAll{
int yes = 1;
int no = 2;
--
Gitblit v1.7.1