From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突

---
 src/router/index.js |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 354b9ff..cdde777 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,9 +19,12 @@
   routes: [{
     path: "/",
     component: Index
-  }, 
+  },
   {
     path: "/enter",
     component: () => import("../view/enter.vue")
-  }]
-})
\ No newline at end of file
+  },{
+		path: "/test/excel",
+		component: () => import("../components/tool/excel.vue")
+	}]
+})

--
Gitblit v1.9.3