From f769d817f8ba2522147c73fa93ccacdc3aab0cb6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
index a1a6221..011433e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
@@ -81,7 +81,7 @@
private String measurementUnit;
@ApiModelProperty(value = "数量")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
private BigDecimal unitPrice;
@@ -105,6 +105,7 @@
private String accountingStatus;
@ApiModelProperty(value = "入账时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate accountingDate;
@ApiModelProperty(value = "会计凭证号")
--
Gitblit v1.7.1