From a332264920c9cd9226d566c19e36e5d5b5549c1b Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Mon, 12 Aug 2019 15:11:31 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- src/main/java/com/moral/service/AlarmService.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moral/service/AlarmService.java b/src/main/java/com/moral/service/AlarmService.java index 4433a59..dcad103 100644 --- a/src/main/java/com/moral/service/AlarmService.java +++ b/src/main/java/com/moral/service/AlarmService.java @@ -1,16 +1,14 @@ package com.moral.service; -import com.moral.entity.charts.TimeUnits; - import java.util.Date; import java.util.List; import java.util.Map; + +import com.moral.entity.charts.TimeUnits; @SuppressWarnings("rawtypes") public interface AlarmService { List<Map> countByTimes(Date start, Date end, TimeUnits timeUnits); - - Map getPieData(Map<String, Object> parameters); } -- Gitblit v1.8.0