From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/excel/UserExcel.java b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
index 31a5970..83292f2 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 1L;
@ColumnWidth(15)
- @ExcelProperty("账户")
+ @ExcelProperty("账号")
private String account;
@ExcelProperty("单位名称")
@@ -53,7 +53,7 @@
private String email;
@ColumnWidth(15)
- @ExcelProperty("手机")
+ @ExcelProperty("联系电话")
private String phone;
@@ -61,9 +61,9 @@
private String sex;
@ExcelProperty("出生日期")
- private String birthtime;
+ private Date birthday;
- @ExcelProperty("身份证")
+ @ExcelProperty("身份证号")
private String cardid;
@ExcelProperty("籍贯")
@@ -95,7 +95,7 @@
@ExcelProperty("保安员证编码")
private String securitynumber;
- @ExcelProperty("在职状态")
+ @ExcelProperty("人员状态")
private String status;
--
Gitblit v1.9.3