From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 affec6e..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,14 +18,42 @@
@Data
public class ComMngVillageServeExcelVO implements Serializable {
/**
+ * villageId
+ */
+ private Long villageId;
+ /**
* 服务分类
*/
@ExcelProperty(value = "街路巷" ,index = 0)
private String alley;
@ExcelProperty(value = "门牌号" ,index = 1)
- private Integer houseNum;
+ private String houseNum;
@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