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

app/Models/Orders.php

@@ -147,7 +147,7 @@ class Orders extends SoftDeletesModel
                     ->leftJoin("room", "room.id", "=", "bed.room_id")
                     ->addSelect("room.name as room_name", "area.name as area_name", "building.name as building_name");
             }
-        ]);
+        ])->orderBy("service_date","desc");
     }
 
     public function customer()