Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

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

@@ -7,6 +7,10 @@

    int insertHistoryHourly(List<Map<String, Object>> list);

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

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

    int insertHistoryO3Hourly(List<Map<String, Object>> list);

}