Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-12 0365eb9f81bd331b0adde6d77fb331213a2c7b30

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

@@ -60,4 +60,6 @@
    List<StockInventoryDto> selectStockInvenrory(Long productModelId);

    IPage<StockInventoryDto> pagestockInventoryNoQua(Page page, @Param("ew") StockInventoryDto stockInventoryDto);

    int updateLocked(@Param("productModelId") Long productModelId, @Param("batchNo") String batchNo, @Param("locked") boolean b);
}