From bbda2ee1af4e86d76f93e00386d77efb56c60d5f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 23 七月 2022 15:42:06 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java |   33 +++++++++++++--------------------
 1 files changed, 13 insertions(+), 20 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..fc7dd95 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)
-    private String phone;
-
-    @ExcelProperty(value = "党员姓名", index = 1)
+    @ExcelProperty(value = "姓名",index = 0)
     private String name;
-
-    @ExcelProperty(value = "所属党组织", index = 2)
-    private String orgName;
-
-    @ExcelProperty(value = "入党日期", index = 3)
-    private Date joinTime;
-
-    @ExcelProperty(value = "转正日期", index = 4)
-    private Date employmentTime;
-
-    @ExcelProperty(value = "报道单位", index = 5)
+    @ExcelProperty(value = "常住社区",index = 1)
+    private String communityName;
+    @ExcelProperty(value = "小区院落",index = 2)
+    private String villageName;
+    @ExcelProperty(value = "工作单位",index = 4)
     private String checkUnitName;
+    @ExcelProperty(value = "职能特长及服务意愿",index = 3)
+    private String specialtyName;
+    @ExcelProperty(value = "工作单位归属",index = 5)
+    private String belongTo;
+    @ExcelProperty(value = "服务社区",index = 6)
+    private String helpCommunityName;
 
-    @ExcelProperty(value = "党龄", index = 6)
-    private Integer partyAge;
-
-    @ExcelProperty(value = "状态",index = 7)
-    private String status;
 }

--
Gitblit v1.7.1