From 992a9184ef1085649688da4a95c0e16789c12be6 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 26 五月 2023 09:57:30 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS-WEB/src/main.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index 890402b..1eec9df 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -85,7 +85,6 @@
 Vue.component('TableCrud',TableCrud)
 
 
-
 // 鍔犺浇鐩稿叧url鍦板潃
 Object.keys(urls).forEach(key => {
   Vue.prototype[key] = urls[key];

--
Gitblit v1.9.3