Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

kaiyu

2020-11-20 995a527d6e7d2d0cb141f6853b2b7a2a67b8a1c2

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

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

public interface AlarmMapper {

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

    List<String> getMacs(Map<String, Object> devices);

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