From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 18c80f2..9cab866 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
@@ -45,8 +45,7 @@
@Autowired
private SysPermissionService permissionService;
- @Autowired
- private SysPasswordService passwordService;
+
@Autowired
private ISysUserService userService;
/**
@@ -74,11 +73,11 @@
boolean b = SecurityUtils.matchesPassword(sysUser.getPassword(),user.getPassword());
if(b)
{
- return AjaxResult.success("瀵嗙爜姝ｇ‘");
+ return AjaxResult.success("鍘熷瘑鐮佹纭�");
}
else
{
- return AjaxResult.error("瀵嗙爜閿欒");
+ return AjaxResult.error("鍘熷瘑鐮侀敊璇�");
}
}
/**
--
Gitblit v1.9.3