Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

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

@@ -1,8 +1,13 @@
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);

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