From be0cfd366f118b482a0e981e3adb4eea6cbc165f Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 31 Aug 2024 16:53:17 +0800
Subject: [PATCH] 核心冲突
---
gz-customerSystem/yarn.lock | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/gz-customerSystem/yarn.lock b/gz-customerSystem/yarn.lock
index 3c9dcb7..efb6240 100644
--- a/gz-customerSystem/yarn.lock
+++ b/gz-customerSystem/yarn.lock
@@ -868,6 +868,11 @@
"@babel/types" "^7.12.12"
"@types/node" "^16.11.10"
+"@arco-themes/react-gzzz@^0.0.2":
+ version "0.0.2"
+ resolved "https://registry.npmmirror.com/@arco-themes/react-gzzz/-/react-gzzz-0.0.2.tgz"
+ integrity sha512-YQGlkswfowsuaodIevDPMx+UPpJW7Is6b3+xFKh49GDNCJf5sIz37bSiK5zxLsIl1pBj16PkUIXzm7Fq4AdHgw==
+
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.24.7", "@babel/code-frame@^7.8.3":
version "7.24.7"
resolved "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.7.tgz"
@@ -8427,6 +8432,11 @@
tinyqueue "^2.0.3"
vt-pbf "^3.1.1"
+mapvgl@^1.0.0-beta.189:
+ version "1.0.0-beta.191"
+ resolved "https://registry.npmmirror.com/mapvgl/-/mapvgl-1.0.0-beta.191.tgz"
+ integrity sha512-kbcLSXPSZybMgvJ0RTPEpISC6hpc27P/UwYCFASKLRe6Z7LC0Z11FwNXvQT/jkAK/LdBm2GqsE9i+GQViqRIYg==
+
material-colors@^1.2.1:
version "1.2.6"
resolved "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz"
@@ -10277,6 +10287,14 @@
regenerator-runtime "^0.13.9"
whatwg-fetch "^3.6.2"
+react-bmapgl@^0.2.27:
+ version "0.2.27"
+ resolved "https://registry.npmmirror.com/react-bmapgl/-/react-bmapgl-0.2.27.tgz"
+ integrity sha512-pCVAuYFwG0rU9j1u9sZ4IWNmUP84pFa5y8nq/lxjzMiQdl04iO39NkTdEg2YRLjF2NF11eigcal/Ne1+zPz4ng==
+ dependencies:
+ mapvgl "^1.0.0-beta.189"
+ shallowequal "^1.1.0"
+
react-clientside-effect@^1.2.6:
version "1.2.6"
resolved "https://registry.npmmirror.com/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz"
--
Gitblit v1.8.0