Merge branch 'zjl_brand_20210715'

app/Http/Controllers/OrderController.php

@@ -530,7 +530,7 @@ Class OrderController extends Controller
         $size = 10;
 
         if ($tid == 1) {
-            $map['order_type_filter'] = in_array($request->user->email, ['admin@ichunt.com', 'vpadmin@ichunt.com']) ? [1, 2, 3, 4] : [1, 4]; // 管理员和尽调账号可以查看平台、ERP、京东订单
+            $map['order_type_filter'] = in_array($request->user->email, ['admin@ichunt.com', 'vpadmin@ichunt.com']) ? [1, 2, 3, 4] : [1, 3, 4]; // 管理员和尽调账号可以查看平台、ERP、京东订单
         } else if ($tid == 2) {
             $size = 20;
             $map['order_type_filter'] = [1, 3, 4]; // 1.网站 3.京东 4.象牙宝