From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java
index c46e46f..0cbeb95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java
@@ -24,6 +24,42 @@
     private String villageImages;
 
     @ApiModelProperty("小区id")
-    private String villageId;
+    private Long villageId;
+
+    @ApiModelProperty("总户数")
+    private Integer houseNum;
+
+    @ApiModelProperty("总人数")
+    private Integer peopleNum;
+
+    @ApiModelProperty("户籍人数")
+    private Integer registerNum;
+
+    @ApiModelProperty("流动人数")
+    private Integer flowNum;
+
+    @ApiModelProperty("楼栋长数量")
+    private Integer buildingPeopleNum;
+
+    @ApiModelProperty("居民小组长数量")
+    private Integer smallHeadmanNum;
+
+    @ApiModelProperty("党小组长数量")
+    private Integer partyPeopleNum;
+
+    @ApiModelProperty("妇女小组长数量")
+    private Integer womanPeopleNum;
+
+    @ApiModelProperty("卫生员数量")
+    private Integer hygienePeopleNum;
+
+    @ApiModelProperty("安全员数量")
+    private Integer securityPeopleNum;
+
+    @ApiModelProperty("监督员数量")
+    private Integer supervisePeopleNum;
+
+    @ApiModelProperty("其他人员")
+    private Integer otherPeopleNum;
 
 }

--
Gitblit v1.7.1