From 8a6375edade9f1edc194a0381369fe94e56c13c7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 13 八月 2021 13:16:36 +0800
Subject: [PATCH] Merge branch 'txb'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java |   18 +++++++++++++++++-
 1 files changed, 17 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 26f437b..dbf564f 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
@@ -38,11 +38,24 @@
      */
     @ApiModelProperty(value = "年龄开始时间查询字段",hidden = true)
     private String ageStartTime;
+
+    /**
+     * 最终年龄开始时间查询字段
+     */
+    @ApiModelProperty(value = "最终年龄开始时间查询字段",hidden = true)
+    private String ageStartTimeEnd;
+
     /**
      * 年龄结束查询字段
      */
     @ApiModelProperty("年龄结束查询字段")
     private String ageEnd;
+
+    /**
+     * 最终年龄结束时间查询字段
+     */
+    @ApiModelProperty(value = "最终年龄结束时间查询字段",hidden = true)
+    private String ageEndTimeEnd;
 
     /**
      * 年龄结束时间查询字段
@@ -86,7 +99,7 @@
      * 小区id(实有房屋id)
      */
     @ApiModelProperty(value="小区id(实有房屋id)")
-    private Integer villageId;
+    private Long villageId;
     /**
      * 家庭成员(姓名)
      */
@@ -193,4 +206,7 @@
     @ApiModelProperty(value="房屋id")
     private Long houseId;
 
+    @ApiModelProperty("居住地址")
+    private String address;
+
 }

--
Gitblit v1.7.1