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

liyong

2026-04-30 a6ff41048bbdd5b8519a3e21e9232a152d179dfc

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

@@ -23,6 +23,8 @@

    IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto);

    IPage<StockInventoryDto> pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto);

    Boolean addstockInventory(StockInventoryDto stockInventoryDto);

    Boolean subtractStockInventory(StockInventoryDto stockInventoryDto);