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

疯狂的狮子li

2021-07-27 06944747fd52b98f21337274678325ff62d10beb

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -154,7 +154,7 @@
            childrenList.add(children);
            router.setChildren(childrenList);
         } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
            router.setMeta(null);
            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
            router.setPath("/inner");
            List<RouterVo> childrenList = new ArrayList<RouterVo>();
            RouterVo children = new RouterVo();