From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 39157fa..5cf5170 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
@@ -34,15 +34,15 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", tags = {"鏁版嵁瀛楀吀淇℃伅绠＄悊"})
+@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
public class SysLoginController {
private final SysLoginService loginService;
private final ISysMenuService menuService;
+ private final ISysUserService userService;
private final SysPermissionService permissionService;
- private final ISysUserService iSysUserService;
/**
* 鐧诲綍鏂规硶
@@ -63,7 +63,7 @@
@ApiOperation("鐧诲嚭鏂规硶")
@PostMapping("/logout")
- public AjaxResult logout(){
+ public AjaxResult<Void> logout(){
try {
StpUtil.logout();
} catch (NotLoginException e) {
--
Gitblit v1.9.3