From 484bd662e2fd4461ef34dbf9d64106c12b3ef961 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:43:49 +0800
Subject: [PATCH] 冲突
---
src/api/index.js | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 5654a60..62f9063 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,7 +1,4 @@
import * as mapApi from './mapApi'
import * as mapUrl from './mapUrl'
-export default {
- mapApi,
- mapUrl
-}
+export default Object.assign({}, mapApi, mapUrl)
--
Gitblit v1.8.0