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/ComMngPopulationExportExcelVO.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java
index 05f7cad..987c829 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/excel/ComMngPopulationExportExcelVO.java
@@ -1,14 +1,14 @@
 package com.panzhihua.common.model.vos.grid.admin.excel;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
+import lombok.Data;
 
 /**
  * @description: 综治后台-居民导出
@@ -21,64 +21,64 @@
     /**
      * 姓名
      */
-    @ExcelProperty(value = "姓名" ,index = 0)
+    @ExcelProperty(value = "姓名", index = 0)
     private String userName;
     /**
      * 身份证号
      */
-    @ExcelProperty(value = "身份证号" ,index = 1)
+    @ExcelProperty(value = "身份证号", index = 1)
     @EncryptDecryptField
     private String cardNo;
     /**
      * 年龄
      */
-    @ExcelProperty(value = "年龄" ,index = 2)
+    @ExcelProperty(value = "年龄", index = 2)
     private Integer age;
     /**
      * 性别
      */
-    @ExcelProperty(value = "性别" ,index = 3)
+    @ExcelProperty(value = "性别", index = 3)
     private String sex = "暂无";
     /**
      * 现居住地址
      */
-    @ExcelProperty(value = "现居住地址" ,index = 4)
+    @ExcelProperty(value = "现居住地址", index = 4)
     private String address;
     /**
      * 政治面貌
      */
-    @ExcelProperty(value = "政治面貌" ,index = 5)
+    @ExcelProperty(value = "政治面貌", index = 5)
     private String politicalOutlook = "暂无";
     /**
      * 联系方式
      */
-    @ExcelProperty(value = "联系方式" ,index = 6)
+    @ExcelProperty(value = "联系方式", index = 6)
     @EncryptDecryptField
     private String phone;
     /**
      * 户籍地址
      */
-    @ExcelProperty(value = "户籍地址" ,index = 7)
+    @ExcelProperty(value = "户籍地址", index = 7)
     private String censusRegister;
     /**
      * 是否关联实有房屋
      */
-    @ExcelProperty(value = "关联实有房屋",index = 8)
+    @ExcelProperty(value = "关联实有房屋", index = 8)
     private String isHouse = "暂无";
     /**
      * 人员标签
      */
-    @ExcelProperty(value = "人员标签" ,index = 9)
+    @ExcelProperty(value = "人员标签", index = 9)
     private String label;
     /**
      * 最后一次走访时间
      */
-    @ExcelProperty(value = "最后一次走访时间",index = 10)
+    @ExcelProperty(value = "最后一次走访时间", index = 10)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createAt;
     /**
      * 最近一次走访状态
      */
-    @ExcelProperty(value = "最近一次走访状态",index = 11)
+    @ExcelProperty(value = "最近一次走访状态", index = 11)
     private String eventStatus = "暂无";
 }

--
Gitblit v1.7.1