Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

 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);

}