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

liyong

2026-01-23 8817c6ab14348b360db70ad748dccb4aef692552

 src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java

@@ -29,6 +29,6 @@

    int updateSubtractStockInventory(@Param("ew") StockInventoryDto stockInventoryDto);

    List<StockInventoryExportData> listStockInventoryExportData(StockInventoryDto stockInventoryDto);
    List<StockInventoryExportData> listStockInventoryExportData(@Param("ew") StockInventoryDto stockInventoryDto);

}