From 84b51d9bfddcc8da58823fde1b322a8168db5cff Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 27 五月 2022 09:35:23 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 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 26cec86..972d3e7 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
@@ -4,6 +4,7 @@
 
 import com.alibaba.excel.annotation.ExcelProperty;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -14,27 +15,19 @@
 @Data
 public class ComPbMemberExcelVO {
 
-    @ExcelProperty(value = "账号", index = 0)
+    @ExcelProperty(value = "联系电话", index = 1)
     private String phone;
 
-    @ExcelProperty(value = "党员姓名", index = 1)
+    @ExcelProperty(value = "党员姓名", index = 0)
     private String name;
 
-    @ExcelProperty(value = "所属党组织", index = 2)
+    @ExcelProperty(value = "所属党组织", index = 4)
     private String orgName;
 
-    @ExcelProperty(value = "入党日期", index = 3)
-    private Date joinTime;
+    @ExcelProperty(value = "技能特长", index = 2)
+    private String specialtyName;
 
-    @ExcelProperty(value = "转正日期", index = 4)
-    private Date employmentTime;
-
-    @ExcelProperty(value = "报道单位", index = 5)
+    @ExcelProperty(value = "报道单位", index = 3)
     private String checkUnitName;
 
-    @ExcelProperty(value = "党龄", index = 6)
-    private Integer partyAge;
-
-    @ExcelProperty(value = "状态",index = 7)
-    private String status;
 }

--
Gitblit v1.7.1