Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 1dfb91db022f6cfa4bcb9d953ca9aa8a503e1ca5

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

@@ -68,7 +68,7 @@
        ajax.put(Constants.TOKEN, tokenService.createTokenApplet(loginUser));
        ajax.put("userInfo",loginUser);
        ajax.put("roleName",loginUser.getRoleName());
        ajax.put("deptType",loginUser.getRoleName());
        ajax.put("deptType",loginUser.getDeptType());
        return ajax;
    }
    /**