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

ruoyi-ui/src/store/modules/permission.js

@@ -74,7 +74,6 @@ function filterChildren(childrenMap) {
           }
           children.push(c)
         })
-        childrenMap.splice(index, 1)
         return
       }
     }