From b24f9c75c79e4de248505295bfea7055e4975ff4 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 25 五月 2021 14:23:04 +0800
Subject: [PATCH] Merge branch 'lyq' into 'test'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 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..97ad064 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
@@ -22,7 +22,7 @@
 
     @ApiModelProperty("门牌号")
     @NotBlank(groups = {AddGroup.class}, message = "门牌号不能为空")
-    private Integer houseNum;
+    private String houseNum;
 
     @ApiModelProperty("小区(组)")
     private String groupAt;
@@ -33,4 +33,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