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

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

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

@@ -38,7 +38,6 @@

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


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

}