# Conflicts:
# src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
# src/main/java/com/huaheng/pc/config/warehouse/mapper/WarehouseMapper.java
# src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
# src/main/java/com/huaheng/pc/shipment/shipmentDetail/mapper/ShipmentDetailMapper.java
# src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailService.java
# src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
# src/main/resources/mybatis/config/WarehouseMapper.xml
# src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml
# src/main/resources/templates/config/carrier/carrier.html
# src/main/resources/templates/config/company/company.html
# src/main/resources/templates/config/configValue/configValue.html
# src/main/resources/templates/config/customer/customer.html
# src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html
# src/main/resources/templates/config/supplier/supplier.html
# src/main/resources/templates/system/config/config.html