From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/AlarmService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/AlarmService.java b/src/main/java/com/moral/service/AlarmService.java
index e3a8a45..dcad103 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -1,10 +1,14 @@
package com.moral.service;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
+
+import com.moral.entity.charts.TimeUnits;
@SuppressWarnings("rawtypes")
public interface AlarmService {
- Map getPieData(Map<String, Object> parameters);
+ List<Map> countByTimes(Date start, Date end, TimeUnits timeUnits);
}
--
Gitblit v1.8.0