Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-06 9b02f67b17b9dcbd798862021ac0a516d1ba69b3

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

@@ -24,4 +24,6 @@
    Map<String,Object> getDataByMac(String mac,String time);

    List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;

    List<Map> getDataByMacAndTime(Map param);
}