From 5275d044d8e1d05ac2efc7cec935c5e28f6d832d Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期三, 13 三月 2024 10:46:30 +0800
Subject: [PATCH] 冲突解决

---
 package.json |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/package.json b/package.json
index 0127b77..f5f6bec 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "font-awesome": "^4.3.0",
     "jquery": "^3.3.1",
     "lodash": "^4.17.21",
-    "ol": "^7.3.0",
+    "ol": "^7.5.0",
+    "ol-ext": "^4.0.10",
     "sass-loader": "^10.0.4",
     "three": "^0.103.0",
     "vcolorpicker": "^0.1.8",

--
Gitblit v1.9.3