From 9687fd99fdf6208dbf747ea45c440f192a9af815 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期五, 14 三月 2025 17:43:16 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev --- cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java index 12fd129..022c5e4 100644 --- a/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java +++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/InstructionMapper.java @@ -8,6 +8,8 @@ import com.ruoyi.device.pojo.DeviceInstruction; import org.apache.ibatis.annotations.Param; +import java.util.Map; + /** * <p> * 浣滀笟鎸囧涔︽坊鍔犲彈鎺ф枃浠惰〃 Mapper 鎺ュ彛 @@ -19,5 +21,5 @@ public interface InstructionMapper extends BaseMapper<DeviceInstruction> { - IPage<DeviceInstruction> pageByPageQueryOfHomeworkInstructions(Page page, @Param("ew") QueryWrapper<DeviceOperationInstructionDto> ew); + IPage<DeviceOperationInstructionDto> pageByPageQueryOfHomeworkInstructions(Page page, @Param("ew") QueryWrapper<DeviceOperationInstructionDto> ew); } -- Gitblit v1.9.3