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

kaiyu

2020-11-24 1d7e1b771160dd8b7f25765e402ce25cac676641

 src/main/java/com/moral/service/HistoryMinutelyService.java

@@ -34,8 +34,10 @@

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

    List<Map<String,Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
    List<Map<String, Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;

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

    List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;

}