From 161ec503806c8b71f5caa2d42c2fa9c03ca062d6 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 15:17:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 8667ec6..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,7 +15,9 @@
List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
- List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState);
+ List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState);
+
+ List<String> listMonitorDeviceSerial();
}
--
Gitblit v1.9.3