Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 c3a11538b96aeac198fbaa467210ef8754773ad1

 ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java

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

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

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