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/model/OaApprovalApplicationAsset.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAsset.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAsset.java
index 71bc14c..7f98adb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAsset.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAsset.java
@@ -60,5 +60,10 @@
@TableField("borrow_application_id")
private Integer borrowApplicationId;
+ @ApiModelProperty(value = "归还状态 0-未归还，1-部分归还，2-已归还")
+ @TableField("return_status")
+ private Integer returnStatus;
+
+
}
--
Gitblit v1.7.1