From 364ba784afea825f761197981f6e68f03ee9382e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 16 六月 2021 20:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java
index a3ad6a1..01832cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java
@@ -18,6 +18,10 @@
 @Data
 public class ComMngVillageServeExcelVO implements Serializable {
     /**
+     * villageId
+     */
+    private Long villageId;
+    /**
      * 服务分类
      */
     @ExcelProperty(value = "街路巷" ,index = 0)
@@ -28,4 +32,28 @@
 
     @ExcelProperty(value = "小区(组)" ,index = 2)
     private String groupAt;
+    /**
+     * 小区类型(1.城镇 2.农村 3.未知)
+     */
+    @ExcelProperty(value = "小区(组)" ,index = 3)
+    private Integer type;
+    /**如果是城镇小区填写楼栋数量 */
+    @ExcelProperty(value = "小区(组)" ,index = 4)
+    private Integer buildSum;
+    /**(城镇)建筑年代*/
+    @ExcelProperty(value = "小区(组)" ,index = 5)
+    private Date buildYear;
+    /**(城镇)建筑类型*/
+    @ExcelProperty(value = "小区(组)" ,index = 6)
+    private Long buildType;
+    /**(城镇)是否存在物业公司*/
+    @ExcelProperty(value = "小区(组)" ,index = 7)
+    private String property;
+    /**(城镇)开发商*/
+    @ExcelProperty(value = "小区(组)" ,index = 8)
+    private String developers;
+    /**(城镇)小区总共居民数量/这户一共住了几口人*/
+    @ExcelProperty(value = "小区(组)" ,index = 9)
+    private Integer userSum;
+    private Date createAt;
 }

--
Gitblit v1.7.1