From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc
---
src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java b/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
index 4e06292..dd07d06 100644
--- a/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
+++ b/src/main/java/org/springblade/modules/training/excel/TrainingRegistrationExcel.java
@@ -1,5 +1,6 @@
package org.springblade.modules.training.excel;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -31,8 +32,13 @@
@ColumnWidth(25)
@ExcelProperty("所属企业名称")
+ @ExcelIgnore
private String deptName;
+ @ColumnWidth(25)
+ @ExcelProperty("从业单位")
+ private String unitName;
+
@ColumnWidth(15)
@ExcelProperty("准考证号")
private String candidateNo;
--
Gitblit v1.9.3