From 6aa6dc075078cca11be048a267911bd7f74dadcd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 16 三月 2025 03:48:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberExcel.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberExcel.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberExcel.java
index a25eeff..0d6fdd0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberExcel.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/excel/PartyMemberExcel.java
@@ -2,6 +2,7 @@
import cn.idev.excel.annotation.ExcelProperty;
import com.panzhihua.sangeshenbian.annotation.FastExcel;
+import com.panzhihua.sangeshenbian.annotation.TargetEnum;
import com.panzhihua.sangeshenbian.conveter.EConverter;
import com.panzhihua.sangeshenbian.enums.FreezeStatusEnum;
import com.panzhihua.sangeshenbian.enums.GenderEnum;
@@ -18,7 +19,7 @@
private String name;
@ExcelProperty(value = {"性别"}, index = 1,converter = EConverter.class)
- @FastExcel(type = GenderEnum.class)
+ @TargetEnum(type = GenderEnum.class)
private Integer gender;
@ExcelProperty(value = {"所在社区"}, index = 2)
@@ -31,7 +32,7 @@
private String partyOrganization;
@ExcelProperty(value = {"审核状态"}, index = 5,converter = EConverter.class)
- @FastExcel(type = FreezeStatusEnum.class)
+ @TargetEnum(type = FreezeStatusEnum.class)
private Integer freezeStatus;
}
--
Gitblit v1.7.1