From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/AlarmService.java |    7 ++++++-
 1 files changed, 6 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..4d14b00 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -1,10 +1,15 @@
 package com.moral.service;
 
+import java.text.ParseException;
+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) throws ParseException;
 
 }

--
Gitblit v1.8.0