From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/AlarmMapper.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/AlarmMapper.java b/src/main/java/com/moral/mapper/AlarmMapper.java
index 1783b24..bbb4f18 100644
--- a/src/main/java/com/moral/mapper/AlarmMapper.java
+++ b/src/main/java/com/moral/mapper/AlarmMapper.java
@@ -10,6 +10,5 @@
public interface AlarmMapper extends BaseMapper<Alarm> {
- List<Map<String, Object>> getAlarmData(Map<String, Object> parameters);
- List<Map> countByTimes(@Param("start")Date start, @Param("end")Date end, @Param("format")String format);
+ List<Map> countByTimes(@Param("start")Date start, @Param("end")Date end, @Param("format")String format,@Param("list") List<String> list);
}
\ No newline at end of file
--
Gitblit v1.8.0