From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java
index db9648c..43defaa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngVillageExportExcelVO.java
@@ -1,14 +1,12 @@
 package com.panzhihua.common.model.vos.grid.admin.excel;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
 import java.io.Serializable;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
 
 /**
  * 小区列表Excel导出
@@ -18,27 +16,25 @@
 @EncryptDecryptClass
 public class ComMngVillageExportExcelVO implements Serializable {
 
-    @ExcelProperty(value = "小区名字" ,index = 0)
+    @ExcelProperty(value = "小区名字", index = 0)
     private String userName;
 
-    @ExcelProperty(value = "街路巷" ,index = 1)
+    @ExcelProperty(value = "街路巷", index = 1)
     private String alley;
 
-    @ExcelProperty(value = "门牌号" ,index = 2)
+    @ExcelProperty(value = "门牌号", index = 2)
     private String doorNum;
 
-    @ExcelProperty(value = "小区地址" ,index = 3)
+    @ExcelProperty(value = "小区地址", index = 3)
     private String address;
 
-    @ExcelProperty(value = "小区楼栋数" ,index = 4)
+    @ExcelProperty(value = "小区楼栋数", index = 4)
     private Integer buildSum;
 
-    @ExcelProperty(value = "小区户数" ,index = 5)
+    @ExcelProperty(value = "小区户数", index = 5)
     private Integer houseNum;
 
-    @ExcelProperty(value = "小区居民人数" ,index = 6)
+    @ExcelProperty(value = "小区居民人数", index = 6)
     private Integer userSum;
-
-
 
 }

--
Gitblit v1.7.1