From ec59ab15df819e21a73435b7522b51982a3b4ca5 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 20 Jan 2024 17:37:13 +0800
Subject: [PATCH] merge
---
package-lock.json | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 67f597b..e736bfe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5484,7 +5484,11 @@
},
"node_modules/echarts": {
"version": "5.4.3",
+<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
+=======
+ "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
+>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
"integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
"dependencies": {
"tslib": "2.3.0",
@@ -14957,7 +14961,11 @@
},
"node_modules/tslib": {
"version": "2.3.0",
+<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+=======
+ "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
},
"node_modules/tty-browserify": {
@@ -16911,7 +16919,11 @@
},
"node_modules/zrender": {
"version": "5.4.4",
+<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
+=======
+ "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
+>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
"integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
"dependencies": {
"tslib": "2.3.0"
@@ -21353,7 +21365,11 @@
},
"echarts": {
"version": "5.4.3",
+<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
+=======
+ "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
+>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
"integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
"requires": {
"tslib": "2.3.0",
@@ -29241,7 +29257,11 @@
},
"tslib": {
"version": "2.3.0",
+<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+=======
+ "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
},
"tty-browserify": {
@@ -30861,7 +30881,11 @@
},
"zrender": {
"version": "5.4.4",
+<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
+=======
+ "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
+>>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
"integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
"requires": {
"tslib": "2.3.0"
--
Gitblit v1.9.3