解决冲突

routes/api.php

@@ -31,18 +31,18 @@ $api->version('v1', [
     $api->group(['middleware' => 'jwt.chxq_auth'], function ($api) {
         $api->get('user', 'UserController@index');
 
-        //自提点列表
-        $api->get('/pickupNode/index','ConfigPickupNodeController@index');
-        //自提点新建
-        $api->post('/pickupNode/add','ConfigPickupNodeController@add');
-        //自提点编辑
-        $api->post('/pickupNode/edit','ConfigPickupNodeController@edit');
-        //查看自提点
-        $api->post('/pickupNode/view','ConfigPickupNodeController@view');
+    //自提点列表
+    $api->get('/pickupNode/index','ConfigPickupNodeController@index');
+    //自提点新建
+    $api->post('/pickupNode/add','ConfigPickupNodeController@add');
+    //自提点编辑
+    $api->post('/pickupNode/edit','ConfigPickupNodeController@edit');
+    //查看自提点
+    $api->post('/pickupNode/view','ConfigPickupNodeController@view');
 
-        //自提点分组列表
-        $api->get('/pickupGroup/index','ConfigPickupGroupController@index');
-        //自提点分组新增
-        $api->post('/pickupGroup/add','ConfigPickupGroupController@add');
+    //自提点分组列表
+    $api->get('/pickupGroup/index','ConfigPickupGroupController@index');
+    //自提点分组新增
+    $api->post('/pickupGroup/add','ConfigPickupGroupController@add');
     });
 });