# Conflicts: # ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/Inventory.java # ruoyi-inventory/src/main/java/com/ruoyi/inventory/mapper/StorageLocationsMapper.java # ruoyi-inventory/src/main/resources/mapper/inventory/InventoryMapper.xml
