Merge branch 'manage-cicle' into jenkins

src/router/routes-common.ts

@@ -272,14 +272,6 @@ export const rootRouter = [
     }
   },
   {
-    path: '/:pathMatch(.*)*',
-    component: () => import('@/views/404'),
-    meta: {
-      title: '404',
-      platform: paymentType
-    }
-  },
-  {
     path: '/subject-echarts',
     name: 'subject-echarts',
     component: () => import('@/views/subject-echarts/index'),
@@ -287,4 +279,13 @@ export const rootRouter = [
       title: '声部图表'
     }
   },
+  {
+    path: '/:pathMatch(.*)*',
+    component: () => import('@/views/404'),
+    meta: {
+      title: '404',
+      platform: paymentType
+    }
+  },
+  
 ]