Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-02-25 87c0074fab42b124a246dd02c6599386ffdbed3c

 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java

@@ -49,7 +49,7 @@
        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
        Long userId = loginUser.getUser().getUserId();
        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
        return AjaxResult.success(menuService.buildMenuTree(menus));
        return AjaxResult.success(menus);
    }

    /**