From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java
index 1317c62..6b3478b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/area/StreetAndBuildVO.java
@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.area;
+import com.panzhihua.common.model.vos.community.screen.event.EventPopulationSpecialStatisticsVO;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -14,15 +16,18 @@
/**
* 人口数量
*/
- private Integer peopleNum;
+ private Integer peopleNum = 0;
/**
* 小区数量
*/
- private Integer villageNum;
+ private Integer villageNum = 0;
/**
* 房屋数量
*/
- private Integer buildNum;
+ private Integer buildNum = 0;
+
+ @ApiModelProperty("特殊人口数据")
+ private EventPopulationSpecialStatisticsVO specialStatisticsVo;
}
--
Gitblit v1.7.1