Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1370 from Tria-plc/freight_feature/usermanagement

Browse Source 
fix issue
This commit is contained in:
marshal
2026-08-20 21:16:37 +03:00
committed by GitHub
parent 93373cbe5e a5e6cab248
commit 8edde1ca76
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/edr-freight-api/src/modules/bookings/bookings.controller.ts
View File

@@ -42,16 +42,13 @@ import type { Response } from "express";
import { BookingClearanceChargeService } from './booking-clearance-charge.service'; import { BookingClearanceChargeService } from './booking-clearance-charge.service';
import { BookingPayablesService } from './booking-payables.service'; import { BookingPayablesService } from './booking-payables.service';
import { ClearanceEventService } from './clearance-event.service'; import { ClearanceEventService } from './clearance-event.service';
<<<<<<< HEAD
import { import {
BillClearanceChargeDto,
RejectClearanceChargeDto, RejectClearanceChargeDto,
} from './dto/clearance-charge.dto'; } from './dto/clearance-charge.dto';
=======
import { BillClearanceChargeDto } from './dto/clearance-charge.dto'; import { BillClearanceChargeDto } from './dto/clearance-charge.dto';
import { AdditionalChargeService } from './additional-charge.service'; import { AdditionalChargeService } from './additional-charge.service';
import { CancelAdditionalChargeDto, CreateAdditionalChargeDto } from './dto/additional-charge.dto'; import { CancelAdditionalChargeDto, CreateAdditionalChargeDto } from './dto/additional-charge.dto';
>>>>>>> 82c795999efce5e4422dd332551cecab2592764d
import { BookingContractService } from './booking-contract.service'; import { BookingContractService } from './booking-contract.service';
import { BookingPricingService } from './booking-pricing.service'; import { BookingPricingService } from './booking-pricing.service';
import { BookingTransitionService } from './booking-transition.service'; import { BookingTransitionService } from './booking-transition.service';