From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突

---
 Code Management/WCS/WIDESEAWCS_Client/src/main.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/main.js b/Code Management/WCS/WIDESEAWCS_Client/src/main.js
index 40c4c4f..c4642ef 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/main.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/main.js
@@ -11,7 +11,7 @@
 // import 'dayjs/locale/zh-cn'
 // import locale from 'element-plus/lib/locale/lang/zh-cn'
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
-
+import 'bootstrap/dist/css/bootstrap.min.css';
 
 
 import permission from './api/permission'

--
Gitblit v1.9.3