From d1302c929961b5ca0ed0845ddc2d5d51373701c7 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 15:50:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/package.json | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/UI-Project/package.json b/UI-Project/package.json
index feeda10..67c31f5 100644
--- a/UI-Project/package.json
+++ b/UI-Project/package.json
@@ -15,6 +15,7 @@
"echarts": "^5.5.1",
"element-plus": "^2.4.0",
"moment": "^2.30.1",
+ "northglass-mes": "file:",
"pinia": "^2.1.6",
"pinia-plugin-persistedstate": "^3.2.0",
"qrcode": "^1.5.4",
@@ -25,7 +26,7 @@
"vue-echarts": "^6.7.3",
"vue-i18n": "^9.10.1",
"vue-print-nb": "^1.7.5",
- "vue-router": "^4.2.4",
+ "vue-router": "^4.0.13",
"vue3-print-nb": "^0.1.4",
"vxe-table": "^4.5.15",
"xe-utils": "^3.5.14",
--
Gitblit v1.8.0