Merge remote-tracking branch 'origin/master'

jinpengyong

2020-05-21 a46f5f1db19dc1af644a4ed013bb12555621e135

 src/main/java/com/moral/mapper/AlarmMapper.java

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

public interface AlarmMapper {

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

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