Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

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

@@ -15,4 +15,6 @@

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

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

}