From ac84b3314e48b61055af907d12aa8bfd4d2cdc75 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 十月 2025 16:28:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching
---
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