From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 46677b3..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
@@ -15,29 +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)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date joinTime;
+ @ExcelProperty(value = "技能特长", index = 2)
+ private String specialtyName;
- @ExcelProperty(value = "转正日期", index = 4)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- 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