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/package.json |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Client/package.json b/Code Management/WCS/WIDESEAWCS_Client/package.json
index 93990d1..3735f3a 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/package.json
+++ b/Code Management/WCS/WIDESEAWCS_Client/package.json
@@ -13,6 +13,7 @@
     "@microsoft/signalr": "^6.0.4",
     "ali-oss": "^6.17.1",
     "axios": "^0.21.1",
+    "bootstrap": "^5.3.3",
     "core-js": "^3.6.5",
     "echarts": "^5.0.2",
     "element-plus": "^2.2.14",
@@ -21,7 +22,7 @@
     "vue": "^3.2.37",
     "vue-draggable-next": "^2.0.1",
     "vue-router": "^4.0.0-0",
-    "vuex": "^4.0.0-0",
+    "vuex": "^4.0.0-0", 
     "wangeditor": "^4.7.6"
   },
   "devDependencies": {

--
Gitblit v1.9.3