From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/AlarmDailyMapper.java b/src/main/java/com/moral/mapper/AlarmDailyMapper.java
index 1fc7606..7e4cc6d 100644
--- a/src/main/java/com/moral/mapper/AlarmDailyMapper.java
+++ b/src/main/java/com/moral/mapper/AlarmDailyMapper.java
@@ -12,4 +12,6 @@
 
 	List<Map<String, Object>> getAlarmDataByYear(Map<String, Object> parameters);
 
+	Map<String, Object> getAlarmDataByMonth(Map<String, Object> parameters);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0