Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

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

@@ -31,6 +31,8 @@


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



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



    //获取一天的所有臭氧值

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