# Conflicts: # .idea/workspace.xml # src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java