From 161a6249e9ed4d63815c953426910f060ac2e6f6 Mon Sep 17 00:00:00 2001
From: DokiYoloo <857815116@qq.com>
Date: Mon, 21 Dec 2020 19:11:25 +0800
Subject: [PATCH] 权限工具类增加admin判断
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index e73a0e0..a9bc15e 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -7,7 +7,6 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
@@ -68,12 +67,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;
/** 部门对象 */
@@ -198,7 +197,6 @@
this.avatar = avatar;
}
- @JsonIgnore
@JsonProperty
public String getPassword()
{
--
Gitblit v1.9.3