From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
index 2e07f03..e056a85 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -10,11 +11,11 @@
import java.util.ArrayList;
public interface IDeviceLedgerService extends IService<DeviceLedger> {
- IPage<DeviceLedger> queryPage(Page page, DeviceLedger deviceLedger);
+ IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger);
AjaxResult saveDeviceLedger(DeviceLedger deviceLedger);
AjaxResult updateDeviceLedger(DeviceLedger deviceLedger);
- void export(HttpServletResponse response, ArrayList<Long> ids);
+ void export(HttpServletResponse response, Long[] ids);
}
--
Gitblit v1.9.3