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.json |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gz-customerSystem/package.json b/gz-customerSystem/package.json
index 21fa917..da96f23 100644
--- a/gz-customerSystem/package.json
+++ b/gz-customerSystem/package.json
@@ -22,6 +22,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",

--
Gitblit v1.8.0