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

liding

2026-03-16 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9

 src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java

@@ -27,7 +27,7 @@
    private String inboundBatches;

    @ApiModelProperty(value = "入库数量")
    private BigDecimal consumablesInNum;
    private BigDecimal stockInNum;

    @ApiModelProperty(value = "记录类型  枚举")
    private String recordType;