Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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

@@ -29,4 +29,5 @@
   

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



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

}