Merge remote-tracking branch 'origin/master' into pim_yys

maven

3 天以前 0ce689b428cf9ceb58972db2bdd42a1a176f8f20

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

@@ -40,7 +40,7 @@
    /**
     * 待出库数量
     */
    @Excel(name = "待出库数量")
//    @Excel(name = "待出库数量")
    private BigDecimal inboundNum0;