From 05d218bdda3f09aa5d057fda916f5f0b668fb720 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 13 Aug 2021 17:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/apply/excel/ApplyExcel.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/excel/ApplyExcel.java b/src/main/java/org/springblade/modules/apply/excel/ApplyExcel.java
index d5a9427..bd323c6 100644
--- a/src/main/java/org/springblade/modules/apply/excel/ApplyExcel.java
+++ b/src/main/java/org/springblade/modules/apply/excel/ApplyExcel.java
@@ -38,13 +38,13 @@
@ColumnWidth(15)
- @ExcelProperty("保安ID")
- private Long userId;
+ @ExcelProperty("保安姓名")
+ private String realName;
- @ColumnWidth(15)
- @ExcelProperty("考试ID")
- private Long examId;
+ @ColumnWidth(25)
+ @ExcelProperty("身份证号")
+ private String idCardNo;
}
--
Gitblit v1.9.3