修改报错

src/services/publishService.ts

@@ -122,18 +122,17 @@ class PublishService {
     return httpService.post('/venues/list', data, {
       showLoading: false })
   }
-<<<<<<< HEAD
   // 畅打发布
   async create_play_pmoothly(data: PublishBallData): Promise<ApiResponse<Response>> {
     return httpService.post('/games/create_play_pmoothly', data, {
       showLoading: true,
       loadingText: '发布中...'
-=======
+    })
+  }
   async getPictures(req: getPicturesReq): Promise<ApiResponse<getPicturesRes>> {
     return httpService.post('/gallery/sys_img_list', req, {
       showLoading: false,
       showToast: false,
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034
     })
   }
 }