Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

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

@@ -10,4 +10,6 @@
    Map<String,Object> getFiveMinutesDataByMac(Map<String,Object> parameters);

    List<Map<String,Object>> getFiveMinutesSersorDataByMacsAndTime(Map<String,Object> parameters);

    List<Map<String,Object>> getFiveMinutesDataByMacsAndTimeSolt(Map<String,Object> parameters);
}