From 052fd7444c1c2852fd9fd07876438c2ed9a5b45a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 07 May 2018 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/AlarmDailyService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/AlarmDailyService.java b/src/main/java/com/moral/service/AlarmDailyService.java
index 1108fd6..6f42c9d 100644
--- a/src/main/java/com/moral/service/AlarmDailyService.java
+++ b/src/main/java/com/moral/service/AlarmDailyService.java
@@ -10,4 +10,6 @@
 
 	List<Integer> getAlarmDataByYear(Map<String, Object> parameters);
 
+	List<Map<String, Object>> getAlarmDataByMonth(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0