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

src/permission.js

@@ -91,7 +91,6 @@ function handleRoute(to, from, next, routeInfo) {
     } else {
         // 除没有动态改变权限的需求可直接next() 删下方权限判断
         if (hasPermission(store.getters.roles, to.meta.roles)) {
-            debugger;
             if (to.path === '/404' && to.redirectedFrom === '/') {
                 next(localStore.get('trainingPlatformRoute' + store.getters.id) || '/trainingPlatform');
             } else {