Merge branch 'master' into development

app/Http/Controllers/OrderController.php

@@ -542,7 +542,7 @@ Class OrderController extends Controller
                 ->where(function ($query) use ($map) {
                     // 订单状态
                     if (!empty($map['order_status'])) {
-                        $query->where('o.status', '=', $map['order_status']);
+                        $query->whereIn('o.status', explode(',', $map['order_status']));
                     }
                 })
                 ->where(function ($query) use ($map) {