From 0a4e55b1cbeb7b81dfa51ebcee2ce83f303dad91 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 28 九月 2025 18:43:04 +0800
Subject: [PATCH] app用户登录，后台用户登录
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUserApplet.java | 11 +++++------
1 files changed, 5 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..bf66bf3 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
@@ -1,8 +1,7 @@
package com.ruoyi.common.core.domain.model;
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.TAppUserResp;
import lombok.Data;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -73,20 +72,20 @@
/**
* 用户信息
*/
- private TTenantResp user;
+ private TAppUserResp user;
public LoginUserApplet()
{
}
- public LoginUserApplet(TTenantResp user, Set<String> permissions)
+ public LoginUserApplet(TAppUserResp 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, TAppUserResp user, Set<String> permissions)
{
this.userId = userId;
this.deptId = deptId;
@@ -134,7 +133,7 @@
@Override
public String getUsername()
{
- return user.getResidentName();
+ return user.getNickName();
}
/**
--
Gitblit v1.7.1