From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
index 687497b..145568c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentLeanOutService.java
@@ -2,9 +2,10 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
 import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
 
 /**
  * @Description: 璁惧鍊熷嚭褰掕繕
@@ -46,9 +47,16 @@
     boolean submit(String id);
 
     /**
+     * 褰掕繕
+     * @param id
+     * @return
+     */
+    boolean equipmentReturn(String id);
+
+    /**
      * 瀹℃壒娴佺▼鎺у埗
      * @param request
      * @return
      */
-    EamEquipmentLeanOut approval(EamEquipmentLeanOut request);
+    EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request);
 }

--
Gitblit v1.9.3