Merge remote-tracking branch 'origin/fyy' into fyy

routes/api.php

@@ -142,7 +142,6 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('fyyList', 'Api\FyyOrderController@orderList');
     $route->any('fyyRefreshOnHandQuantity', 'Api\FyyOrderController@fyyRefreshOnHandQuantity');
     $route->any('fyyMobileList', 'Api\FyyOrderController@orderMobileList');
-    $route->any('getOutOrderNum','Api\FyyOrderController@getOutOrderNum');
 
     //获取发货单
     $route->any('getShipmentOrder', 'Api\FyyOrderController@getShipmentOrder');