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

kaiyu

2020-11-24 3152a4e4dadcd6ebfb8e882aa356d063416d49cc

 src/main/java/com/moral/mapper/AQIMapper.java

@@ -11,10 +11,10 @@

    List<Map<String,Object>> getO3(Map<String,Object> params);

    String getO3ByTime(Map<String,Object> params);
    String getAqiFromHangzhou(Map<String, Object> params);

    List<Map<String,Object>> getAqiByHour(Map<String,Object> params);

    String getO3FromHistory(Map<String,Object> params);
    String getAqiFromHistory(Map<String, Object> params);

}