# Conflicts:
# src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java
# src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
# src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
# src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
# src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
# src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
# src/main/java/com/huaheng/pc/task/task/service/TaskServiceImpl.java
# src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
# src/main/resources/mybatis/receipt/ReceiptDetailMapperAuto.xml
# src/main/resources/mybatis/shipment/ShipmentDetailMapperAuto.xml
# src/main/resources/mybatis/task/TaskMapper.xml
# src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
# src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
