Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 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);

}