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

yuan

8 天以前 86b776e14070d7e00471b591a5325104772e7fc4

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

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

    private BigDecimal warnNum;

    /**
     * 合同号
     */