fix conflict

ca6c6a54 · 朱继来 · e06288d0 · 05f3d024 · ca6c6a54 · ca6c6a54
Commit ca6c6a54 authored May 28, 2018 by 朱继来
Showing with 113 additions and 50 deletions
app/Http/Controllers/OrderController.php
app/Http/routes.php
--- a/app/Http/Controllers/OrderController.php
+++ b/app/Http/Controllers/OrderController.php
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -71,6 +71,7 @@ Route::group(['middleware' => 'web'], function () {
    Route::post('/ajaxSelfExpress',                           'OrderController@ajaxSelfExpress');

    Route::match(['get', 'post'], '/express_set',             'OrderController@expressSet');
+    Route::match(['get', 'post'], '/tempcount',               'OrderController@tempCount');

    Route::post('/ajaxDownloadContract',                      'OrderController@ajaxDownloadContract');