mkm/goview_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复合并时遗漏的冲突

Browse Source
This commit is contained in:
tnt group 2022-09-25 22:10:42 +08:00
parent 73955aef09
commit 5987e83a12
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/mock/index.ts
View File

@ -76,17 +76,15 @@ const mockObject: MockMethod[] = [
response: () => test.fetchScatterBasic response: () => test.fetchScatterBasic
}, },
{ {
<<<<<<< HEAD
url: mapUrl, url: mapUrl,
method: RequestHttpEnum.GET, method: RequestHttpEnum.GET,
response: () => test.fetchMap response: () => test.fetchMap
}, },
======= {
url: wordCloudUrl, url: wordCloudUrl,
method: RequestHttpEnum.GET, method: RequestHttpEnum.GET,
response: () => test.fetchWordCloud response: () => test.fetchWordCloud
} }
>>>>>>> dev-wordcloud
] ]
export default mockObject export default mockObject