Merge branch 'zjl_adjust_20181026' into development

app/Http/Controllers/AddOrderController.php

@@ -281,7 +281,7 @@ Class AddOrderController extends Controller
         if (!empty($intracode)) {
             $user = DB::connection('order')->table('lie_user_main')->where('user_id', $intracode->user_id)->select('mobile')->first();
 
-            $info['mobile'] = $user->mobile ? $user->mobile : '';
+            $info['mobile'] = $user ? $user->mobile : '';
         }
 
         return view('addOffline', $info);