From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationDTO.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 f83d72e..26f437b 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
@@ -32,11 +32,23 @@
      */
     @ApiModelProperty("年龄开始查询字段")
     private String ageStart;
+
+    /**
+     * 年龄开始时间查询字段
+     */
+    @ApiModelProperty(value = "年龄开始时间查询字段",hidden = true)
+    private String ageStartTime;
     /**
      * 年龄结束查询字段
      */
     @ApiModelProperty("年龄结束查询字段")
     private String ageEnd;
+
+    /**
+     * 年龄结束时间查询字段
+     */
+    @ApiModelProperty(value = "年龄结束时间查询字段",hidden = true)
+    private String ageEndTime;
 
     /**
      * 籍贯
@@ -169,4 +181,16 @@
     @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;
+
 }

--
Gitblit v1.7.1