From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 05 八月 2021 15:12:39 +0800 Subject: [PATCH] Merge branch 'test' into 'master' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 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..3555e91 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 @@ -1,5 +1,7 @@ package com.panzhihua.common.model.vos.community.screen.civil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,6 +26,43 @@ private String villageImages; @ApiModelProperty("小区id") - private String villageId; + @JsonSerialize(using = ToStringSerializer.class) + 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