From 2ef19aff2a07ec697c1f1c672fbb2bf82cafacc0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 17 Aug 2024 18:21:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/package-lock.json | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/gz-customerSystem/package-lock.json b/gz-customerSystem/package-lock.json
index 5d00727..5f9571f 100644
--- a/gz-customerSystem/package-lock.json
+++ b/gz-customerSystem/package-lock.json
@@ -27,6 +27,7 @@
"import": "0.0.6",
"prop-types": "^15.8.1",
"react": "^17.0.2",
+ "react-bmapgl": "^0.2.27",
"react-custom-scrollbars": "^4.2.1",
"react-dom": "^17.0.2",
"react-infinite-scroll-component": "^6.1.0",
@@ -15758,6 +15759,11 @@
"node": ">=6.4.0"
}
},
+ "node_modules/mapvgl": {
+ "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=="
+ },
"node_modules/material-colors": {
"version": "1.2.6",
"resolved": "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz",
@@ -18943,6 +18949,19 @@
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
"license": "MIT"
},
+ "node_modules/react-bmapgl": {
+ "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"
+ },
+ "peerDependencies": {
+ "react": ">=16.8.0",
+ "react-dom": ">=16.8.0"
+ }
+ },
"node_modules/react-clientside-effect": {
"version": "1.2.6",
"resolved": "https://registry.npmmirror.com/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz",
--
Gitblit v1.8.0