From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index 81e374a..9f7186c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -1,7 +1,6 @@
 package com.ruoyi.common.core.domain.model;
 
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.dto.RoleDTO;
 import com.ruoyi.common.helper.LoginHelper;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,6 +30,11 @@
      * 閮ㄩ棬ID
      */
     private Long deptId;
+
+    /**
+     * 閮ㄩ棬鍚�
+     */
+    private String deptName;
 
     /**
      * 鐢ㄦ埛鍞竴鏍囪瘑
@@ -88,14 +92,9 @@
     private String username;
 
     /**
-     * 閮ㄩ棬瀵硅薄
-     */
-    private SysDept dept;
-
-    /**
      * 瑙掕壊瀵硅薄
      */
-    private List<SysRole> roles;
+    private List<RoleDTO> roles;
 
     /**
      * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID

--
Gitblit v1.9.3