From bef458cd14d2e0f2b09d76b609291f47be3cd525 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 16:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 a7c1df4..e0a5447 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,9 +15,9 @@
List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
- List<MonitorBo> listMonitorByIds(String keyword, int bindingState, int equipmentState, Long userid);
+ List<MonitorBo> listMonitorByIds(List<String> list, int bindingState, int equipmentState);
- List<String> listMonitorDeviceSerial();
+ List<String> listMonitorDeviceSerial(Long userid, String keyword);
}
--
Gitblit v1.9.3