Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-11-24 1d7e1b771160dd8b7f25765e402ce25cac676641

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

@@ -32,6 +32,7 @@

    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);

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

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