Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -1,8 +1,12 @@
package com.moral.mapper;

import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

public interface HistoryFiveMinutelyMapper {
    List<Map<String,Object>> getFiveMinutesDataByMacsAndTime(Map<String,Object> parameters);

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

}