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/partybuilding/ComPbMemberExcelVO.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java
index 0ad10b9..0e153f3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java
@@ -1,9 +1,10 @@
 package com.panzhihua.common.model.vos.partybuilding;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
 import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
 
 /**
  * @description: 党员信息导出
@@ -13,21 +14,21 @@
 @Data
 public class ComPbMemberExcelVO {
 
-    @ExcelProperty(value = "党员姓名" ,index = 0)
+    @ExcelProperty(value = "党员姓名", index = 0)
     private String comName;
 
-    @ExcelProperty(value = "身份证号" ,index = 1)
+    @ExcelProperty(value = "身份证号", index = 1)
     private String idCard;
 
-    @ExcelProperty(value = "所属党组织" ,index = 2)
+    @ExcelProperty(value = "所属党组织", index = 2)
     private String orgName;
 
-    @ExcelProperty(value = "入党日期" ,index = 3)
+    @ExcelProperty(value = "入党日期", index = 3)
     private Date joinTime;
 
-    @ExcelProperty(value = "转正日期" ,index = 4)
+    @ExcelProperty(value = "转正日期", index = 4)
     private Date employmentTime;
 
-    @ExcelProperty(value = "所属社区" ,index = 5)
+    @ExcelProperty(value = "所属社区", index = 5)
     private String communityName;
 }

--
Gitblit v1.7.1