From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +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 a8947e9..df785be 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
@@ -12,7 +12,9 @@
List<MonitorBo> listMonitorByIds(List<String> list, int equipmentState);
- List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState);
+ List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState, String orderBy);
+
+ List<MonitorBo> newListMonitorOnBind(Long userid, String keyword);
}
--
Gitblit v1.9.3