Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

 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);