From 92ff484325b9af3afd081ec079f74fbc6dd3fea8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 15:43:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetPageVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetPageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetPageVO.java
index 92c1663..7064d10 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetPageVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetPageVO.java
@@ -46,5 +46,12 @@
@ApiModelProperty("归还状态 0-待归还，1-部分归还，2-全部归还")
private Integer returnStatus;
+
+ @ApiModelProperty("预计归还日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private LocalDate expectReturnDate;
+
+ @ApiModelProperty("到期天数，小于0表示已过期，0表示今天到期，大于0表示还有多少天到期")
+ private Integer dueDays;
}
--
Gitblit v1.7.1