Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
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);
 
    List<Map<String,Object>> getFiveMinutesDataByMacsAndTimeSolt(Map<String,Object> parameters);
}