Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Manager/OrdersController.php

@@ -192,7 +192,7 @@ class OrdersController extends CommonController
         $model = $this->_getOrderModel();
         $order = $model->with([
             "orderItems" => function ($query) {
-                $query->orderBy("id", "desc");
+                $query->orderBy("service_cate", "desc");
             },
             "recharges",
             "refunds"