From 4cb4de86dbdd30a7d1382233b6c01265185a8261 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 04 六月 2020 09:48:05 +0800
Subject: [PATCH] 修复首页搜索菜单外链无法点击跳转问题
---
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 6c2981e..88a80c3 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -7,8 +7,10 @@
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
import com.ruoyi.framework.aspectj.lang.annotation.Excels;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -26,6 +28,7 @@
private Long userId;
/** 部门ID */
+ @Excel(name = "部门编号", type = Type.IMPORT)
private Long deptId;
/** 用户账号 */
@@ -65,15 +68,18 @@
private String delFlag;
/** 最后登陆IP */
- @Excel(name = "最后登陆IP")
+ @Excel(name = "最后登陆IP", type = Type.EXPORT)
private String loginIp;
/** 最后登陆时间 */
- @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
/** 部门对象 */
- @Excels({ @Excel(name = "部门名称", targetAttr = "deptName"), @Excel(name = "部门负责人", targetAttr = "leader") })
+ @Excels({
+ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+ @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+ })
private SysDept dept;
/** 角色对象 */
@@ -191,6 +197,7 @@
this.avatar = avatar;
}
+ @JsonProperty
public String getPassword()
{
return password;
--
Gitblit v1.9.2