From e43478e41aafb7460d200059deca9a9a63ddbd9a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 07 Aug 2021 18:12:42 +0800
Subject: [PATCH] 冲突

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

diff --git a/src/router/views/index.js b/src/router/views/index.js
index af95f62..214e8a6 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -812,5 +812,18 @@
         component: () =>
             import( /* webpackChunkName: "views" */ '@/views/people/job')
     }]
-},
+}, {
+    path: '/resource',
+    redirect: '/resource/uploadNotice',
+    component: Layout,
+    children: [{
+        path: 'uploadNotice',
+        name: '通知公告>附件上传',
+        meta: {
+            i18n: 'index',
+        },
+        component: () =>
+            import( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
+    }]
+}
 ]

--
Gitblit v1.9.3