From eb4376b649a0f8783e8f70406a438ad3c61b8f12 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 10 十月 2021 14:30:08 +0800
Subject: [PATCH] Excel导入支持@Excels注解
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index f7e68e7..08cf151 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -68,12 +68,12 @@
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
- /** 最后登陆IP */
- @Excel(name = "最后登陆IP", type = Type.EXPORT)
+ /** 最后登录IP */
+ @Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp;
- /** 最后登陆时间 */
- @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ /** 最后登录时间 */
+ @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
/** 部门对象 */
@@ -91,6 +91,9 @@
/** 岗位组 */
private Long[] postIds;
+
+ /** 角色ID */
+ private Long roleId;
public SysUser()
{
@@ -198,7 +201,7 @@
this.avatar = avatar;
}
- @JsonIgnore
+ @JsonIgnore
@JsonProperty
public String getPassword()
{
@@ -300,6 +303,16 @@
this.postIds = postIds;
}
+ public Long getRoleId()
+ {
+ return roleId;
+ }
+
+ public void setRoleId(Long roleId)
+ {
+ this.roleId = roleId;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.2