From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 十月 2025 11:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java
index f88ad32..242d43c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationAssetService.java
@@ -87,8 +87,17 @@
     IPage<OaApprovalApplicationAssetPageVO> getReturnNotifyPageList(OaApprovalApplicationAssetPageQuery pageQuery);
 
     /**
+     * 获取归还单详情
+     * @param id
+     * @return
+     */
+    OaApprovalApplicationAssetDetailVO getReturnDetail(Integer id);
+
+    /**
      * 删除审批单相关的资产领用/借用/归还记录
      * @param applicationId
      */
     void deleteByApplicationId(Integer applicationId);
+
+    OaApprovalApplicationAsset getOaApprovalApplicationAssetByApplicationId(Integer applicationId);
 }

--
Gitblit v1.7.1