Merge remote-tracking branch 'origin/master'

lizijie

2020-11-05 ff4135a758efe532ee5566fbdb6d9fee9e8410f8

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

}