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