From 241408b071cb1b43d9307ae9c75c82bb77b6faa7 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期二, 20 九月 2022 17:10:27 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java
index fd8294a..222adf4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberExcelVO.java
@@ -2,6 +2,7 @@
import java.io.Serializable;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
@@ -20,28 +21,14 @@
@ExcelProperty(value = "党员姓名", index = 0)
private String name;
/**
- * 身份证号
- */
- @ExcelProperty(value = "身份证号", index = 1)
- private String idCard;
- /**
* 所属党组织
*/
@ExcelProperty(value = "所属党组织", index = 2)
private String orgName;
- /**
- * 入党日期
- */
- @ExcelProperty(value = "入党日期", index = 3)
- private String joinTime;
- /**
- * 转正日期
- */
- @ExcelProperty(value = "转正日期", index = 4)
- private String employmentTime;
- /**
- * 所属社区
- */
- @ExcelProperty(value = "所属社区", index = 5)
- private String communityName;
+
+ @ExcelProperty(value = "联系电话",index = 1)
+ private String phone;
+
+ @ExcelIgnore
+ private Long communityId;
}
--
Gitblit v1.7.1