Merge remote-tracking branch 'origin/master'

feige

2024-10-18 98cd4713254614381ede8fa42d0820a3ffc1d53e

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

@@ -48,7 +48,8 @@
    public AjaxResult login(@RequestBody LoginBody loginBody)
    {
        // 生成令牌
        String token = loginService.login(loginBody.getNickName(), loginBody.getPassword(), loginBody.getCode(),
        System.out.println(loginBody);
        String token = loginService.login(loginBody.getNickname(), loginBody.getPassword(), loginBody.getCode(),
                loginBody.getUuid());

        HashMap<String, String> tokenMap = new HashMap<>();