From e41b1b4d8744eccf44979e29526e7dd15c8af5eb Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 21 十二月 2021 15:41:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 c1e8c86..1e425d9 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
@@ -8,6 +8,10 @@
@Mapper
public interface MonitorMapper extends BaseMapper<Monitor> {
- List<Monitor> listMonitorByKeyword(String keyword, String equipmentState1, String equipmentState2,
- String bindingState1, String bindingState2);
+ List<Monitor> listMonitorByKeyword(String keyword, int equipmentState1, int equipmentState2,
+ int bindingState1, int bindingState2);
}
+
+
+
+
--
Gitblit v1.9.3