From 0b30ecf9d6581b4e7a6f7b397ced716acaeaefc0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:15:37 +0800
Subject: [PATCH] 更新冲突

---
 UI-Project/package-lock.json |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UI-Project/package-lock.json b/UI-Project/package-lock.json
index dce25ad..61009b3 100644
--- a/UI-Project/package-lock.json
+++ b/UI-Project/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "northglass-erp",
+  "name": "northglass-mes",
   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "northglass-erp",
+      "name": "northglass-mes",
       "version": "0.0.0",
       "dependencies": {
         "@element-plus/icons-vue": "^2.1.0",

--
Gitblit v1.8.0