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

gongchunyi

2 天以前 cca82e1212056b0ec17e038912f3b0c2ba1e9c61

 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java

@@ -20,6 +20,8 @@

    private Integer recordId;

    private BigDecimal warnNum;

    /**
     * 入库数量
     */