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

ZhuDongming

2020-06-19 3421ec9112c3742c76b2f733434c3ee499f5be8a

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

@@ -9,6 +9,8 @@

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

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

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

    void createTable(@Param("yearAndMonth") String yearAndMonth);