mirror of
https://gitee.com/dromara/go-view.git
synced 2025-02-24 16:22:57 +08:00
fix: 修复合并时遗漏的冲突
This commit is contained in:
parent
73955aef09
commit
5987e83a12
@ -76,17 +76,15 @@ const mockObject: MockMethod[] = [
|
||||
response: () => test.fetchScatterBasic
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
url: mapUrl,
|
||||
method: RequestHttpEnum.GET,
|
||||
response: () => test.fetchMap
|
||||
},
|
||||
=======
|
||||
{
|
||||
url: wordCloudUrl,
|
||||
method: RequestHttpEnum.GET,
|
||||
response: () => test.fetchWordCloud
|
||||
}
|
||||
>>>>>>> dev-wordcloud
|
||||
]
|
||||
|
||||
export default mockObject
|
||||
|
Loading…
Reference in New Issue
Block a user