From 030201887b4690e20b1f9ffae548ccd840e7077f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 九月 2025 15:23:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainVO.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainVO.java
index ddb939b..16a7e92 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainVO.java
@@ -1,21 +1,26 @@
package com.ruoyi.system.vo.asset;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDate;
/**
* 审批通过资产分页视图对象
*/
@Data
-@ApiModel("审批通过资产分页视图对象")
+@ApiModel("资产视图对象")
public class AssetMainVO implements Serializable {
private static final long serialVersionUID = -1287342342234234234L;
@ApiModelProperty(value = "资产ID")
private Integer id;
+
+ @ApiModelProperty(value = "审批申请记录ID")
+ private Integer approvalApplicationId;
@ApiModelProperty(value = "资产编码")
private String assetCode;
@@ -44,5 +49,14 @@
@ApiModelProperty(value = "资产类别ID，关联asset_type表")
private Integer assetTypeId;
+ @ApiModelProperty(value = "入库时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate storageTime;
+
+ @ApiModelProperty(value = "使用部门/位置")
+ private String useDeptOrLocation;
+
+
+
}
--
Gitblit v1.7.1