Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/java/com/moral/service/HistoryFiveMinutelyService.java

@@ -7,4 +7,6 @@
    List<Map<String, Object>> getFiveMinutesDataByMacsAndTime(Map<String, Object> parameters);

    Map<String,Object> getFiveMinutesDataByMac(Map<String, Object> parameters);

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