# Conflicts:
# src/main/java/com/huaheng/pc/inventory/inventory/mapper/InventoryMapper.java
# src/main/java/com/huaheng/pc/inventory/inventory/service/IInventoryService.java
# src/main/java/com/huaheng/pc/inventory/inventory/service/InventoryServiceImpl.java
# src/main/java/com/huaheng/pc/receipt/receiptDetail/mapper/ReceiptDetailMapper.java
# src/main/java/com/huaheng/pc/receipt/receiptDetail/service/IReceiptDetailService.java
# src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
# src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/IShipmentDetailService.java
# src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
# src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/IShipmentHeaderService.java
# src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
# src/main/java/com/huaheng/pc/task/task/mapper/TaskMapper.java
# src/main/resources/mybatis/inventory/InventoryMapper.xml
# src/main/resources/mybatis/receipt/ReceiptDetailMapper.xml
