fix conflict

2026-06-27 10:53:31 +03:30
parent 6fc073c7e8 0291ee6716
commit aa468b592b
16 changed files with 151 additions and 23 deletions
--- a/app/Services/Cartables/Mission/Report/ReportMachineService.php
+++ b/app/Services/Cartables/Mission/Report/ReportMachineService.php
@@ -27,7 +27,6 @@ class ReportMachineService
            ->orderByRaw('COUNT(*) DESC');

        $fields = ['machine_code','machine_id','cm.car_name','missions', 'func'];
-
        return DataTableFacade::run(
            $query,
            $request,