From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index a8b5321..1fbaeeb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -50,8 +50,10 @@
         // 鐢熸垚浠ょ墝
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
+
         HashMap<String, String> tokenMap = new HashMap<>();
         tokenMap.put("token",token);
+       // tokenMap.put("roid",roid)
         return AjaxResult.success(tokenMap);
     }
 

--
Gitblit v1.9.1