From 1653a604a16c7f6eca5149038bcb122846b3ce03 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 29 Dec 2023 15:46:42 +0800
Subject: [PATCH] 增加用户信息身份证、学历、入职时间
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 3 +++
src/main/java/org/springblade/modules/system/excel/UserExcel.java | 4 ++++
src/main/java/org/springblade/modules/system/entity/User.java | 12 ++++++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 2d6f517..7218f08 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -72,6 +72,18 @@
*/
private String phone;
/**
+ * 身份证号码
+ */
+ private String cardNo;
+ /**
+ * 学历
+ */
+ private String educationBackground;
+ /**
+ * 入职时间
+ */
+ private String entryJobTime;
+ /**
* 生日
*/
private Date birthday;
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 d062bea..9ab367c 100644
--- a/src/main/java/org/springblade/modules/system/excel/UserExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/UserExcel.java
@@ -51,6 +51,10 @@
private String userTypeName;
@ColumnWidth(15)
+ @ExcelProperty("员工编号")
+ private String code;
+
+ @ColumnWidth(15)
@ExcelProperty("账户")
private String account;
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index ea9e949..e08b50e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -20,6 +20,9 @@
<result column="real_name" property="realName"/>
<result column="email" property="email"/>
<result column="phone" property="phone"/>
+ <result column="card_no" property="cardNo"/>
+ <result column="education_background" property="educationBackground"/>
+ <result column="entry_job_time" property="entryJobTime"/>
<result column="birthday" property="birthday"/>
<result column="sex" property="sex"/>
<result column="role_id" property="roleId"/>
--
Gitblit v1.9.3