Merge branch 'zjl_iteration_20181127' into development

app/Http/Controllers/AddOrderController.php

@@ -253,6 +253,7 @@ Class AddOrderController extends Controller
             $data['num'] = $request->input('num');
             $data['buy'] = $request->input('buy');
             $data['delivery_place'] = $request->input('delivery_place');
+            $data['type'] = 2; // 后台添加标记
             $data['pf'] = 4;
 
             $data['k1'] = time();