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

liding

2026-03-16 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9

 src/main/java/com/ruoyi/consumables/mapper/ConsumablesInventoryMapper.java

@@ -36,9 +36,9 @@

    List<ConsumablesInventoryExportData> listConsumablesInventoryExportData(@Param("ew") ConsumablesInventoryDto ConsumablesInventoryDto);

    IPage<ConsumablesInRecordDto> ConsumablesInventoryPage(@Param("ew") ConsumablesInventoryDto ConsumablesInventoryDto, Page page);
    IPage<ConsumablesInRecordDto> consumablesInventoryPage(@Param("ew") ConsumablesInventoryDto ConsumablesInventoryDto, Page page);

    IPage<ConsumablesInventoryDto> ConsumablesInAndOutRecord(@Param("ew") ConsumablesInventoryDto ConsumablesInventoryDto, Page page);
    IPage<ConsumablesInventoryDto> consumablesInAndOutRecord(@Param("ew") ConsumablesInventoryDto ConsumablesInventoryDto, Page page);

    BigDecimal selectTotal();