From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +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