采集器代码冲突解决

app/Controller/LoginController.php

@@ -83,11 +83,7 @@ class LoginController extends AbstractController
             'user_name' => $userInfos['data']['user_name'],
             'mobile' => $userInfos['data']['mobile'],
             'email' => $userInfos['data']['email'],
-<<<<<<< HEAD
-//            'rong_token' => $userInfos['data']['rong_token'],
-=======
             // 'rong_token' => $userInfos['data']['rong_token'],
->>>>>>> collector_1106_fr
             'level_id' => $userInfos['data']['level_id'],
             'type_id' => $userInfos['data']['type_id'],
         ];

app/JsonRpc/WebsiteService.php

@@ -398,8 +398,4 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> web_sannong_fr
 }

config/api/collector.php

@@ -46,15 +46,10 @@ Router::addGroup(
         Router::post('/addCatid', [CollectorController::class, 'addCatid']);
         //导入数据
         Router::get('/addArt', [CollectorController::class, 'addArt']);
-<<<<<<< HEAD
         //关联导航
         Router::get('/addCatid', [CollectorController::class, 'addCatid']);
         //开始采集
         Router::post('/sendCrawler', [CollectorController::class, 'sendCrawler']);
-=======
-        
-        
->>>>>>> collector_1106_fr
         
     },
     ['middleware' => [FooMiddleware::class]]