From ff3af3a0dd0fe87a500c13e933bea1f553083508 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 21 Sep 2023 10:47:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java
index 5eb2191..fd13764 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java
@@ -1,7 +1,5 @@
package com.moral.api.mapper;
-import org.apache.ibatis.annotations.Param;
-
import java.util.List;
import java.util.Map;
@@ -11,6 +9,7 @@
import com.moral.api.entity.Device;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.vo.device.DeviceVO;
+import io.lettuce.core.dynamic.annotation.Param;
/**
* <p>
@@ -24,6 +23,6 @@
DeviceVO selectDeviceInfoById(Integer deviceId);
- List<Device> queryDeviceUnitAlarmInfo();
+ List<Device> queryDeviceUnitAlarmInfo(@Param("region") String mac);
}
--
Gitblit v1.8.0