From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java
index 2a51934..e2f21d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/volunteer/ComMngVolunteerExcelVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community.volunteer;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
@@ -30,7 +31,10 @@
@ExcelProperty(value = "技能", index = 5)
private String skillName;
- @ExcelProperty(value = "是否是大学生", index = 6)
+ @ExcelProperty(value = "在读大学名称", index = 6)
+ private String universityName;
+
+ @ExcelIgnore
private Integer isUniversity;
}
--
Gitblit v1.7.1