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

kaiyu

2020-11-24 3152a4e4dadcd6ebfb8e882aa356d063416d49cc

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

}