From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突

---
 admin/package.json |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/admin/package.json b/admin/package.json
index 78ce443..5405124 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -13,6 +13,7 @@
     "fix": "eslint --ext .js,.vue src --fix"
   },
   "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^1.0.2",

--
Gitblit v1.9.3