Merge branch 'zjl_erp_syn_20190514' into development

app/Http/Controllers/OrderController.php

@@ -430,7 +430,7 @@ Class OrderController extends Controller
             $map['order_type_filter'] = [1];
         } else if ($tid == 2) {
             $size = 20;
-            $map['order_type_filter'] = [1, 3]; // 1. 网站 2. 京东
+            $map['order_type_filter'] = [1, 3, 4]; // 1.网站 3.京东 4.象牙宝
         } else if ($tid == 3) {
             $map['order_goods_type'] = 1; // 联营订单
             $map['order_type_filter'] = [2, 3]; // 2-ERP, 3-JD