From 3de2d31db9ac65c354fd228ab84fa2ed786482b9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 29 九月 2025 11:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java
index 54166a8..736b37f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/AssetStatisticsDetailVO.java
@@ -9,15 +9,20 @@
import java.time.LocalDate;
@Data
-@ApiModel(value = "资产汇总分页返回VO")
+@ApiModel(value = "资产出入库/明细分页返回VO")
public class AssetStatisticsDetailVO implements Serializable {
-
+ @ApiModelProperty(value = "出入库类型")
+ private String typeName;
+ @ApiModelProperty(value = "出入库类型 0-入库，1-出库")
+ private Integer type;
@ApiModelProperty(value = "资产名称")
private String assetName;
@ApiModelProperty(value = "规格型号")
private String specificationModel;
@ApiModelProperty(value = "资产类型")
private String assetTypeName;
+ @ApiModelProperty(value = "资产类型id")
+ private Integer assetTypeId;
@ApiModelProperty(value = "资产类别")
private String category;
@ApiModelProperty(value = "计量单位")
--
Gitblit v1.7.1