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

云

昨天 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

 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);
}