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

Conflicts: ruoyi-admin/src/main/resources/application.yml ruoyi-ui/src/store/modules/permission.js
2020-12-21 11:55:32 +08:00 · 2020-12-21 11:55:32 +08:00 · 78ef398257
parent 805c79506b 52264b6e2a
commit 78ef398257
1 changed files with 0 additions and 1 deletions
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@ -74,7 +74,6 @@ function filterChildren(childrenMap) {
          }
          children.push(c)
        })
-        childrenMap.splice(index, 1)
        return
      }
    }