From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java
index a3eea4e..4fefbc6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.vo.asset;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.system.model.OaApprovalApplicationAssetItem;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,7 +41,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applicationDate;
- @ApiModelProperty(value = "事由/原因/说明")
+ @ApiModelProperty(value = "事由/原因/说明/备注")
private String applicationReason;
@ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回")
@@ -61,9 +60,11 @@
private Integer assetTypeId;
@ApiModelProperty(value = "领用/借用日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDate operateTime;
@ApiModelProperty(value = "预计退还日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDate expectReturnDate;
@ApiModelProperty(value = "操作类型 0-领用，1-借用，2-归还")
@@ -72,7 +73,14 @@
@ApiModelProperty(value = "借用审批ID,类型为归还时使用。")
private Integer borrowApplicationId;
+ @ApiModelProperty(value = "归还状态 0-待归还，1-部分归还，2-全部归还")
+ private Integer returnStatus;
+
+ @ApiModelProperty(value = "借用日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private LocalDate borrowDate;
+
@ApiModelProperty("关联资产项列表")
- private List<OaApprovalApplicationAssetItem> items;
+ private List<AssetMainVO> items;
}
--
Gitblit v1.7.1