Merge branch 'master' into development

app/Http/Controllers/AddOrderController.php

@@ -213,6 +213,7 @@ Class AddOrderController extends Controller
         $address->district_val = $this->getAddress($address->district); 
              
         $info['address'] = $address;
+        $sale_id         = $request->user->userId;
         $info['sale_id'] = $request->user->userId;
 
         // 当前登录用户名称