Merge branch '03/12permission' into 02_07search

src/views/categroyManager/vipNewActive.vue

@@ -455,7 +455,7 @@ export default {
               this.onReSet();
               this.$store.dispatch('delVisitedViews', this.$route)
               this.$router.push({
-                path: "/vipClassSet/vipActiveList"
+                path: "/vipActiveManager/vipActiveList"
               });
             }
           });