From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/AlarmService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/AlarmService.java b/src/main/java/com/moral/service/AlarmService.java
index dcad103..4d14b00 100644
--- a/src/main/java/com/moral/service/AlarmService.java
+++ b/src/main/java/com/moral/service/AlarmService.java
@@ -1,5 +1,6 @@
package com.moral.service;
+import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -9,6 +10,6 @@
@SuppressWarnings("rawtypes")
public interface AlarmService {
- List<Map> countByTimes(Date start, Date end, TimeUnits timeUnits);
+ List<Map> countByTimes(Date start, Date end, TimeUnits timeUnits) throws ParseException;
}
--
Gitblit v1.8.0