From 7693272d85e41ad3ea843ca2011311c8cf75ce9b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 11 九月 2025 09:03:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
index 186be08..fa46b95 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.entity.TTenantResp;
+import com.ruoyi.common.core.domain.entity.TSysUserResp;
import lombok.Data;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -73,20 +73,20 @@
/**
* 用户信息
*/
- private TTenantResp user;
+ private TSysUserResp user;
public LoginUserApplet()
{
}
- public LoginUserApplet(TTenantResp user, Set<String> permissions)
+ public LoginUserApplet(TSysUserResp user, Set<String> permissions)
{
this.user = user;
this.permissions = permissions;
}
- public LoginUserApplet(String userId, Long deptId, TTenantResp user, Set<String> permissions)
+ public LoginUserApplet(String userId, Long deptId, TSysUserResp user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -128,13 +128,13 @@
@Override
public String getPassword()
{
- return user.getPassword();
+ return null;
}
@Override
public String getUsername()
{
- return user.getResidentName();
+ return user.getNickName();
}
/**
--
Gitblit v1.7.1