Merge remote-tracking branch 'origin/master'

lizijie

2020-11-05 ff4135a758efe532ee5566fbdb6d9fee9e8410f8

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

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

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

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

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

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

}