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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 29564b7..83292f2 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -53,7 +53,7 @@
 	private String email;
 
 	@ColumnWidth(15)
-	@ExcelProperty("手机")
+	@ExcelProperty("联系电话")
 	private String phone;
 
 
@@ -63,7 +63,7 @@
 	@ExcelProperty("出生日期")
 	private Date birthday;
 
-	@ExcelProperty("身份证")
+	@ExcelProperty("身份证号")
 	private String cardid;
 
 	@ExcelProperty("籍贯")

--
Gitblit v1.9.3