Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-24 3eee19c9a2d7dafcb24f8fba448eff33b9558b03

 ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -56,6 +56,9 @@
  },
  methods: {
    hasOneShowingChild(children = [], parent) {
      if (!children) {
        children = [];
      }
      const showingChildren = children.filter(item => {
        if (item.hidden) {
          return false