From 9fb6f5adf9f63deffd377c001aaab8ffeae4c742 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期一, 25 八月 2025 11:37:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java b/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java index 91265e3..2a162d2 100644 --- a/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java +++ b/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java @@ -2,8 +2,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto; import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.warehouse.pojo.DocumentationReturnManagement; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -22,11 +24,13 @@ boolean deleteByIds(List<Long> ids); - boolean reventdbm(DocumentationBorrowManagement documentationBorrowManagement); + boolean reventdbm(DocumentationReturnManagement documentationReturnManagement); boolean reventDeleteByIds(List<Long> ids); void export(HttpServletResponse response, DocumentationBorrowManagement documentationBorrowManagement); - void exportrevent(HttpServletResponse response, DocumentationBorrowManagement documentationBorrowManagement); + void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement); + + List<DocumentationBorrowManagementDto> listAll(); } -- Gitblit v1.9.3