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

maven

昨天 e896ea812c8121b01d2108b259c96d71baccb368

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

@@ -18,6 +18,15 @@

    private BigDecimal quantityStock;

    private BigDecimal unitPrice;

    private BigDecimal totalPrice;

    private List<Integer> ids;

    /**
     * 出库类型 1-采购 2-销售 3-自定义
     */
    private Integer type;

}