From de608054e6399c3cbe9deb85d6bf5194e78e292f Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 29 三月 2021 22:43:29 +0800
Subject: [PATCH] fix(人力资源微服务): 修改导入bug
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
index 88fde0a..70071d3 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
@@ -58,15 +58,25 @@
*/
@TableId(value = "USER_ID", type = IdType.AUTO)
private Long userId;
-
+ /**
+ * 部门名称
+ */
+ @TableField(exist = false)
+ @ExcelField(value = "部门(护卫点)")
+ private String deptName;
/**
* 用户名
*/
@TableField("USERNAME")
@Size(min = 4, max = 10, message = "{range}")
- @ExcelField(value = "用户名")
+ @ExcelField(value = "用户名",comment = "提示：必填，只能填写用户名")
private String username;
-
+ /**
+ * 头像
+ */
+ @TableField("nickName")
+ @ExcelField(value = "员工姓名",comment = "提示：必填，只能填写员工姓名")
+ private String nickName;
/**
* 密码
*/
@@ -100,6 +110,7 @@
* 身份證號
*/
@TableField("certificateNumb")
+ @ExcelField(value = "身份证号",comment = "提示：必填，只能填写身份证")
private String certificateNumb;
/**
@@ -114,28 +125,24 @@
* 创建时间
*/
@TableField("CREATE_TIME")
- @ExcelField(value = "创建时间", writeConverter = TimeConverter.class)
private Date createTime;
/**
* 修改时间
*/
@TableField("MODIFY_TIME")
- @ExcelField(value = "修改时间", writeConverter = TimeConverter.class)
private Date modifyTime;
/**
* 最近访问时间
*/
@TableField("LAST_LOGIN_TIME")
- @ExcelField(value = "最近访问时间", writeConverter = TimeConverter.class)
private Date lastLoginTime;
/**
* 性别 0男 1女 2 保密
*/
@TableField("SSEX")
- @ExcelField(value = "性别", writeConverterExp = "0=男,1=女,2=保密")
private String sex;
/**
@@ -144,25 +151,16 @@
@TableField("AVATAR")
private String avatar;
- /**
- * 头像
- */
- @TableField("nickName")
- private String nickName;
+
/**
* 描述
*/
@TableField("DESCRIPTION")
@Size(max = 100, message = "{noMoreThan}")
- @ExcelField(value = "个人描述")
private String description;
- /**
- * 部门名称
- */
- @TableField(exist = false)
- private String deptName;
+
@TableField(exist = false)
private String createTimeFrom;
@@ -181,4 +179,6 @@
@TableField(exist = false)
private String deptIds;
+ @TableField(exist = false)
+ private String allDeptName;
}
--
Gitblit v1.8.0