From 671db291656c3927ef58bbbdfb245746c63cec3e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 21 六月 2025 09:34:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 670e6b3..efa3f7b 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
@@ -24,7 +24,7 @@
/**
* 部门ID
*/
- private Long deptId;
+ private String deptId;
/**
* 用户唯一标识
@@ -81,7 +81,7 @@
this.permissions = permissions;
}
- public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+ public LoginUser(Long userId, String deptId, SysUser user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -99,12 +99,12 @@
this.userId = userId;
}
- public Long getDeptId()
+ public String getDeptId()
{
return deptId;
}
- public void setDeptId(Long deptId)
+ public void setDeptId(String deptId)
{
this.deptId = deptId;
}
--
Gitblit v1.7.1