From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageServeExcelVO.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 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 01832cf..4dcfb0b 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
@@ -1,15 +1,11 @@
package com.panzhihua.common.model.vos.community;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
/**
* @description: 批量导入实有房屋（小区）
@@ -24,36 +20,36 @@
/**
* 服务分类
*/
- @ExcelProperty(value = "街路巷" ,index = 0)
+ @ExcelProperty(value = "街路巷", index = 0)
private String alley;
- @ExcelProperty(value = "门牌号" ,index = 1)
+ @ExcelProperty(value = "门牌号", index = 1)
private String houseNum;
- @ExcelProperty(value = "小区（组）" ,index = 2)
+ @ExcelProperty(value = "小区（组）", index = 2)
private String groupAt;
/**
* 小区类型（1.城镇 2.农村 3.未知）
*/
- @ExcelProperty(value = "小区（组）" ,index = 3)
+ @ExcelProperty(value = "小区（组）", index = 3)
private Integer type;
- /**如果是城镇小区填写楼栋数量 */
- @ExcelProperty(value = "小区（组）" ,index = 4)
+ /** 如果是城镇小区填写楼栋数量 */
+ @ExcelProperty(value = "小区（组）", index = 4)
private Integer buildSum;
- /**(城镇)建筑年代*/
- @ExcelProperty(value = "小区（组）" ,index = 5)
+ /** (城镇)建筑年代 */
+ @ExcelProperty(value = "小区（组）", index = 5)
private Date buildYear;
- /**(城镇)建筑类型*/
- @ExcelProperty(value = "小区（组）" ,index = 6)
+ /** (城镇)建筑类型 */
+ @ExcelProperty(value = "小区（组）", index = 6)
private Long buildType;
- /**(城镇)是否存在物业公司*/
- @ExcelProperty(value = "小区（组）" ,index = 7)
+ /** (城镇)是否存在物业公司 */
+ @ExcelProperty(value = "小区（组）", index = 7)
private String property;
- /**(城镇)开发商*/
- @ExcelProperty(value = "小区（组）" ,index = 8)
+ /** (城镇)开发商 */
+ @ExcelProperty(value = "小区（组）", index = 8)
private String developers;
- /**(城镇)小区总共居民数量/这户一共住了几口人*/
- @ExcelProperty(value = "小区（组）" ,index = 9)
+ /** (城镇)小区总共居民数量/这户一共住了几口人 */
+ @ExcelProperty(value = "小区（组）", index = 9)
private Integer userSum;
private Date createAt;
}
--
Gitblit v1.7.1