Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -26,4 +26,6 @@
    List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;

    List<Map> getDataByMacAndTime(Map param);

    List<Map> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
}