浏览代码

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

tnt group 3 年之前
父节点
当前提交
5987e83a12
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      src/api/mock/index.ts

+ 1 - 3
src/api/mock/index.ts

@@ -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