From 1f65fd011582ac6587d60475315d2ee6662d9d5b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Sep 2023 09:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/mapper/DeviceMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 0d2726a..5eb2191 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
@@ -22,6 +22,8 @@
*/
public interface DeviceMapper extends BaseMapper<Device> {
- IPage<DeviceVO> selectAllDeviceInfo(Page<DeviceVO> page, @Param("ew") QueryWrapper<DeviceVO> queryWrapper);
+ DeviceVO selectDeviceInfoById(Integer deviceId);
+
+ List<Device> queryDeviceUnitAlarmInfo();
}
--
Gitblit v1.8.0