Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-04-15 dae6e068207ad1bff32dafd8c71f12d8a2a59aa2

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -73,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("原密码错误");
        }
    }
    /**