Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 f6839337d85392dde294caf959e3f171230ba08b

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

@@ -101,6 +101,8 @@
        LoginUserApplet loginUser = loginService.loginApplet(loginBody.getUsername(), loginBody.getPassword());
        ajax.put(Constants.TOKEN, tokenService.createTokenApplet(loginUser));
        ajax.put("userInfo",loginUser);
        ajax.put("roleName",loginUser.getRoleName());
        ajax.put("deptType",loginUser.getRoleName());
        return ajax;
    }