From 188abb2598a9253b19762d0cf4c4b36db64bfe8b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:54:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 package.json |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/package.json b/package.json
index 1004223..aa3ea33 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,10 @@
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "core-js": "^3.6.5",
-    "dayjs": "^1.9.6",
+    "dayjs": "^1.10.4",
     "echarts": "^4.2.1",
     "element-ui": "^2.14.1",
+    "esri-leaflet": "^3.0.1",
     "fullscreen": "^1.1.1",
     "jquery": "^3.5.1",
     "js-cookie": "^2.2.0",
@@ -28,6 +29,8 @@
     "leaflet.markercluster": "^1.4.1",
     "lodash": "^4.17.10",
     "nprogress": "^0.2.0",
+    "proj4": "^2.7.2",
+    "qs": "^6.10.1",
     "rbush": "^3.0.1",
     "screenfull": "^3.3.3",
     "style-resources-loader": "^1.4.1",

--
Gitblit v1.8.0