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/model/OaApprovalApplicationAsset.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 5c8f830..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
@@ -54,11 +54,16 @@
@ApiModelProperty(value = "操作类型 0-领用，1-借用，2-归还")
@TableField("type")
- private Boolean type;
+ private Integer type;
@ApiModelProperty(value = "借用审批ID,类型为归还时使用。")
@TableField("borrow_application_id")
private Integer borrowApplicationId;
+ @ApiModelProperty(value = "归还状态 0-未归还，1-部分归还，2-已归还")
+ @TableField("return_status")
+ private Integer returnStatus;
+
+
}
--
Gitblit v1.7.1