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

gongchunyi

6 天以前 82402ef5ae74acd08815005cec52d9a959ddea06

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

@@ -25,6 +25,8 @@
    @Excel(name = "入库批次")
    private String inboundBatches;

    private BigDecimal warnNum;

    /**
     * 合同号
     */