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 | 6 ++++++
1 files changed, 6 insertions(+), 0 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 7cbf3f5..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
@@ -1,6 +1,7 @@
package com.sandu.ximon.dao.mapper;
import com.sandu.common.domain.BaseMapper;
+import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import org.apache.ibatis.annotations.Mapper;
@@ -12,6 +13,11 @@
int bindingState1, int bindingState2);
List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
+
+
+ List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState);
+
+ List<String> listMonitorDeviceSerial();
}
--
Gitblit v1.9.3