Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 src/main/java/com/moral/service/AlarmService.java

@@ -5,7 +5,7 @@

public interface AlarmService {

    List<Map<String, Object>> getAvgAlarmData(Map<String,Object> devices);
    List<Map<String, Object>> getAlarmData();

    int insertAlarmDaily(List<Map<String,Object>> list);