Merge branch 'zjl_batch_goods_20181129' into development

app/Http/routes.php

@@ -100,6 +100,7 @@ Route::group(['middleware' => 'web'], function () {
     Route::post('/ajax/selfCheck',                            'AddOrderController@selfCheck');
     Route::post('/ajax/switchSaleType',                       'AddOrderController@switchSaleType');
     Route::post('/ajax/checkStock',                           'AddOrderController@checkStock');
+    Route::post('/ajax/batchGoodsImport',                     'AddOrderController@batchGoodsImport');
 
     Route::match(['get', 'post'],'/web/{key}',                'WebController@info');
     Route::match(['get', 'post'],'/api/{key}',                'ApiController@Entrance');