fix conflict

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,

app/Services/Cartables/Mission/RequestPortalService.php

@@ -34,7 +34,7 @@ class RequestPortalService
                 'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
                 'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
                 'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
-                'driver_id', 'driver_name'
+                'driver_id', 'driver_name', 'machine_id', 'item_id', 'sub_item_id'
             ]
         );
     }