# Conflicts: # warehouse/src/main/java/com/baiyue/warehouse/dto/WarehouseRequests.java # warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseImportService.java # warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseSaveNormalizer.java # warehouse/src/main/resources/db/warehouse.sql