From d297132aba417a5cc5ea4330d9134341738184dc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 05 Nov 2021 17:32:17 +0800
Subject: [PATCH] 冲突

---
 src/router/views/index.js |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index a7cc1b2..0412456 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -970,6 +970,15 @@
     }]
 },
 {
+    path: 'modifiedGrades',
+    name: '修改成绩管理',
+    meta: {
+        i18n: 'modifiedGrades'
+    },
+    component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/trainExam/modifiedGrades')
+},
+{
     path: '/accreditationRecords',
     component: Layout,
     redirect: '/accreditationRecords/accreditationRecords',
@@ -982,5 +991,19 @@
         component: () =>
             import( /* webpackChunkName: "views" */ '@/views/accreditationRecords/accreditationRecords')
     }]
-}
+},
+{
+    path: '/certificateOfPrint',
+    component: Layout,
+    redirect: '/certificateOfPrint/index',
+    children: [{
+        path: 'index',
+        name: '纸质证书制作',
+        meta: {
+            i18n: 'index'
+        },
+        component: () =>
+            import( /* webpackChunkName: "views" */ '@/views/securityGuard/certificateOfPrint')
+    }]
+},
 ]
\ No newline at end of file

--
Gitblit v1.9.3