From 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
index f0fb2e5..7e6d0e3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
@@ -15,12 +15,9 @@
List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
+ List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState);
-
-
- List<Long> listMonitorId(String keyword, Long clientId, int bindingState);
-
- List<MonitorBo> listMonitorByIds(List<Long> airEquipmentIdList);
+ List<String> listMonitorDeviceSerial();
}
--
Gitblit v1.9.3