Merge remote-tracking branch 'origin/master'

mitao

28 分钟以前 28f9605441cdda5bd9cfabd2241ff8509a4a8888

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorageAsset.java

@@ -64,7 +64,7 @@
    private String measurementUnit;

    @ApiModelProperty(value = "数量")
    private BigDecimal quantity;
    private Integer quantity;

    @ApiModelProperty(value = "单价")
    private BigDecimal unitPrice;