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

gongchunyi

23 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

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

    private Integer recordId;

    private BigDecimal warnNum;

    /**
     * 入库数量
     */