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

liyong

4 天以前 33f9eae4ad4321860e4881f5f38dad6368c878ef

 src/main/java/com/ruoyi/stock/service/StockInventoryService.java

@@ -47,4 +47,6 @@
    Boolean thawStock(StockInventoryDto stockInventoryDto);

    List<StockInventory> getByModelId(Long modelId);

    IPage<StockInventoryDto> getBatchNoQty(Page page, StockInventoryDto stockInventoryDto);
}