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/vos/community/ComMngVillageVO.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
index 2e5293c..3bb7b1a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
@@ -16,13 +16,16 @@
@ApiModel("实有房屋（小区）")
public class ComMngVillageVO {
+ @ApiModelProperty("小区id")
+ private Long villageId;
+
@ApiModelProperty("街路巷")
@NotBlank(groups = {AddGroup.class}, message = "街路巷不能为空")
private String alley;
@ApiModelProperty("门牌号")
@NotBlank(groups = {AddGroup.class}, message = "门牌号不能为空")
- private Integer houseNum;
+ private String houseNum;
@ApiModelProperty("小区（组）")
private String groupAt;
@@ -33,4 +36,26 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("创建时间")
private Date createAt;
+
+ @ApiModelProperty("小区类型（1.城镇 2.农村 3.未知）")
+ private Integer type;
+
+ @ApiModelProperty("小区地址")
+ private String address;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("更新时间")
+ private Date updateAt;
+
+ @ApiModelProperty("栋数")
+ private Integer floorTotal = 0;
+
+ @ApiModelProperty("户数")
+ private Integer houseTotal = 0;
+
+ @ApiModelProperty("人口数")
+ private Integer populationTotal = 0;
+
+ @ApiModelProperty("车辆数")
+ private Integer carTotal = 0;
}
--
Gitblit v1.7.1