From 82ab4b1e6fc4e204b4fd7546749bdb86ceeddade Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 14 二月 2025 15:37:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java index 51fb581..a7a640b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java @@ -72,9 +72,9 @@ * * @return 用户信息 */ - public LoginUser getLoginUserApplet() + public LoginUserApplet getLoginUserApplet() { - return getLoginUser(ServletUtils.getRequest()); + return getLoginUserApplet(ServletUtils.getRequest()); } /** * 获取用户身份信息 -- Gitblit v1.7.1