From a1160706d2940bcbd38233731691a999be1d4024 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期六, 11 十月 2025 11:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
index 78cf436..22ec2d2 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
@@ -3,18 +3,23 @@
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;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
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, Long[] ids);
+
+ Boolean importData(MultipartFile file) throws IOException;
}
--
Gitblit v1.9.3