Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

6 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -429,4 +429,9 @@
        stockInventory.setLockedQuantity(stockInventory.getLockedQuantity().subtract(stockInventoryDto.getLockedQuantity()));
        return this.updateById(stockInventory);
    }

    @Override
    public List<StockInventory> getByModelId(Long modelId) {
        return stockInventoryMapper.getByModelId(modelId);
    }
}