From a3a0d8a83e538efc6cf27865e5a33bf26e958ff7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 九月 2025 09:37:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetPageVO.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 c420e67..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
@@ -25,10 +25,10 @@
@ApiModelProperty("标题")
private String title;
- @ApiModelProperty("领用部门")
+ @ApiModelProperty("领用/借用部门")
private String deptName;
- @ApiModelProperty("领用人")
+ @ApiModelProperty("领用/借用人")
private String applicantName;
@ApiModelProperty("资产一级类型名称")
@@ -37,11 +37,21 @@
@ApiModelProperty("资产二级类型名称")
private String secondAssetTypeName;
- @ApiModelProperty("领用日期")
+ @ApiModelProperty("领用/借用日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate operateTime;
@ApiModelProperty("状态 0-草稿，1-待审批，2-通过，3-拒绝，4-撤回")
private Integer approvalStatus;
+
+ @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