Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

1
2
3
4
5
6
7
8
9
10
11
12
13
14
package com.moral.service; 
 
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); 
 
}