From db184afd0c5bf3359b44eb0251fa5b07386eb3ff Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期三, 06 十一月 2024 09:48:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusDeviceService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusDeviceService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusDeviceService.java
index 85fe38e..311222f 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusDeviceService.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/modbus/service/ChannelModbusDeviceService.java
@@ -1,6 +1,7 @@
 package com.iailab.module.data.channel.modbus.service;
 
-import com.iailab.module.data.common.utils.PageUtils;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.module.data.channel.modbus.vo.ModBusDevicePageReqVO;
 import com.iailab.module.data.channel.modbus.dto.ChannelModBusDeviceDTO;
 import com.iailab.module.data.channel.modbus.entity.ChannelModBusDeviceEntity;
 
@@ -16,9 +17,9 @@
     /**
      * 分页查询设备
      *
-     * @param params
+     * @param reqVO
      */
-    PageUtils queryPage(Map<String, Object> params);
+    PageResult<ChannelModBusDeviceEntity> queryPage(ModBusDevicePageReqVO reqVO);
     /**
      * 添加设备
      *

--
Gitblit v1.9.3