From 652db871507244a5838fc6b36d9b9771b527ad61 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageListVO.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageListVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageListVO.java
index 25cf045..ef7ed45 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageListVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageListVO.java
@@ -19,19 +19,18 @@
@ApiModelProperty(value = "规格型号")
private String specificationModel;
@ApiModelProperty(value = "资产类型")
- private String assetTypeName;
+ private String category;
@ApiModelProperty(value = "计量单位")
private String measurementUnit;
@ApiModelProperty(value = "数量")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
private BigDecimal unitPrice;
@ApiModelProperty(value = "总价值（数量*单价）")
private BigDecimal totalValue;
@ApiModelProperty(value = "入账时间")
- @TableField("accounting_date")
private LocalDate accountingDate;
@ApiModelProperty(value = "会计凭证号")
--
Gitblit v1.7.1