From 5b26077c6b895dc72e7a80e6d2ddccc7b754da8e Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期日, 09 十月 2022 13:59:42 +0800
Subject: [PATCH] Merge branch '20221008' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java
index e82e81a..00dfe6d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngBuildingExcelVO.java
@@ -17,49 +17,49 @@
private static final long serialVersionUID = 1719392023800643085L;
private Long id;
- @ExcelProperty(value = "楼房属性", index = 1)
- private String useType;
- @ExcelProperty(value = "建筑类型", index = 2)
- private String buildType;
+// @ExcelProperty(value = "楼房属性", index = 0)
+// private String useType;
+// @ExcelProperty(value = "建筑类型", index = 1)
+// private String buildType;
- @ExcelProperty(value = "街路巷", index = 3)
+ @ExcelProperty(value = "街路巷", index = 0)
private String alley;
- @ExcelProperty(value = "小区名称", index = 4)
+ @ExcelProperty(value = "小区名称", index = 1)
private String villageName;
- @ExcelProperty(value = "门牌号", index = 5)
+ @ExcelProperty(value = "街路巷号", index = 2)
private String doorNo;
- @ExcelProperty(value = "楼栋号/楼栋名称", index = 6)
+ @ExcelProperty(value = "楼栋号", index = 3)
private String name;
- @ExcelProperty(value = "单元数", index = 7)
- private Integer unitTotal;
-
- @ExcelProperty(value = "楼层数", index = 8)
- private Integer buildFloorSum;
-
- @ExcelProperty(value = "每层户数", index = 9)
- private Integer everyFloorSum;
-
- @ExcelProperty(value = "总户数", index = 10)
- private Integer buildUserSum;
-
- @ExcelProperty(value = "电梯", index = 11)
- private Integer elevatorTotal;
-
- @ExcelProperty(value = "物业公司名称", index = 12)
- private String propertyCompanyName;
-
- @ExcelProperty(value = "建筑年代", index = 13)
- private Date buildDate;
-
- @ExcelProperty(value = "备注", index = 14)
- private String remark;
-
- @ExcelProperty(value = "网格划分", index = 15)
- private String gridId;
+// @ExcelProperty(value = "单元数", index = 6)
+// private Integer unitTotal;
+//
+// @ExcelProperty(value = "楼层数", index = 7)
+// private Integer buildFloorSum;
+//
+// @ExcelProperty(value = "每层户数", index = 8)
+// private Integer everyFloorSum;
+//
+// @ExcelProperty(value = "总户数", index = 9)
+// private Integer buildUserSum;
+//
+// @ExcelProperty(value = "电梯", index = 10)
+// private Integer elevatorTotal;
+//
+// @ExcelProperty(value = "物业公司名称", index = 11)
+// private String propertyCompanyName;
+//
+// @ExcelProperty(value = "建筑年代", index = 12)
+// private Date buildDate;
+//
+// @ExcelProperty(value = "备注", index = 13)
+// private String remark;
+//
+// @ExcelProperty(value = "网格划分", index = 14)
+// private String gridId;
private String gridName;
}
--
Gitblit v1.7.1