merge again

2023-10-26 11:32:29 +08:00
parent 06e8a72f80
commit 503e988f7b
2 changed files with 0 additions and 16 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,16 +73,6 @@ export const constantRoutes = [
    path: '/',
    component: Layout,
    // redirect: 'core/base/factory',
-<<<<<<< HEAD
-    children: [{
-      path: 'index',
-      // redirect: 'core/base/factory',
-      component: (resolve) => require(['@/views/index'], resolve),
-      name: '首页',
-      meta: { title: '首页', icon: 'dashboard', affix: true }
-    }
-    ]
-=======
    // children: [{
    //   path: 'index',
    //   redirect: 'core/base/factory',
@@ -91,7 +81,6 @@ export const constantRoutes = [
    //   meta: { title: '首页', icon: 'dashboard', affix: true }
    // }
    // ]
->>>>>>> projects/mes-test
  },
  {
    path: '/user',