From c9d1bf762e05e8a83cda1da6c56f4bd96d3b67fc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:21:47 +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 | 15 ++++++++++++++-
1 files changed, 14 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 b1b4bfc..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;
/**
* 家庭成员（姓名）
*/
--
Gitblit v1.7.1