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

gongchunyi

昨天 da54b18e2934c39eb21e246aeda8baef9d1af933

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

@@ -17,6 +17,22 @@
    private String createBy;
    private BigDecimal minStock;


    /**
     * 单价
     */
    private BigDecimal unitPrice;

    /**
     * 总价
     */
    private BigDecimal totalPrice;

    // 单价
    private BigDecimal taxInclusiveUnitPrice;
    // 总价
    private BigDecimal taxInclusiveTotalPrice;

    private Long createUser;

    private String createTime;