From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/AlarmMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/AlarmMapper.java b/src/main/java/com/moral/mapper/AlarmMapper.java
index a184316..aac5662 100644
--- a/src/main/java/com/moral/mapper/AlarmMapper.java
+++ b/src/main/java/com/moral/mapper/AlarmMapper.java
@@ -1,13 +1,14 @@
package com.moral.mapper;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Alarm;
+import org.apache.ibatis.annotations.Param;
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);
}
\ No newline at end of file
--
Gitblit v1.8.0