From 7c3738df442e6b456ca68670e086357fbb08d521 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 28 四月 2022 18:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 3690503..10bae06 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
@@ -9,15 +9,10 @@
@Mapper
public interface MonitorMapper extends BaseMapper<Monitor> {
- List<Monitor> listMonitorByKeyword(String keyword, int equipmentState1, int equipmentState2,
- int bindingState1, int bindingState2);
- List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
+ List<MonitorBo> listMonitorByIds(List<String> list, int bindingState, int equipmentState);
-
- List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState, Long userid);
-
- List<String> listMonitorDeviceSerial();
+ List<Monitor> listMonitorDeviceSerial1(Long userid, String keyword);
}
--
Gitblit v1.9.3