From 2d0487d82ff61219c71155699b52d8d339a2443a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 23 三月 2022 14:35:27 +0800
Subject: [PATCH] Merge branch 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 0e153f3..26cec86 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
@@ -14,11 +14,11 @@
@Data
public class ComPbMemberExcelVO {
- @ExcelProperty(value = "党员姓名", index = 0)
- private String comName;
+ @ExcelProperty(value = "账号", index = 0)
+ private String phone;
- @ExcelProperty(value = "身份证号", index = 1)
- private String idCard;
+ @ExcelProperty(value = "党员姓名", index = 1)
+ private String name;
@ExcelProperty(value = "所属党组织", index = 2)
private String orgName;
@@ -29,6 +29,12 @@
@ExcelProperty(value = "转正日期", index = 4)
private Date employmentTime;
- @ExcelProperty(value = "所属社区", index = 5)
- private String communityName;
+ @ExcelProperty(value = "报道单位", index = 5)
+ private String checkUnitName;
+
+ @ExcelProperty(value = "党龄", index = 6)
+ private Integer partyAge;
+
+ @ExcelProperty(value = "状态",index = 7)
+ private String status;
}
--
Gitblit v1.7.1