From 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 11 七月 2022 09:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberExcelVO.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 972d3e7..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
@@ -15,19 +15,19 @@
@Data
public class ComPbMemberExcelVO {
- @ExcelProperty(value = "联系电话", index = 1)
- private String phone;
-
- @ExcelProperty(value = "党员姓名", index = 0)
+ @ExcelProperty(value = "姓名",index = 0)
private String name;
-
- @ExcelProperty(value = "所属党组织", index = 4)
- private String orgName;
-
- @ExcelProperty(value = "技能特长", index = 2)
- private String specialtyName;
-
- @ExcelProperty(value = "报道单位", index = 3)
+ @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;
}
--
Gitblit v1.7.1