# Conflicts:
# src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java
# src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationService.java
# src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
# src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java
# src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
# src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
# src/main/java/com/huaheng/pc/config/location/service/LocationService.java
# src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
# src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
# src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java