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

lizijie

2021-11-29 d8310f6bc609440fa352c0e5a9436c7c78caa287

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

@@ -19,4 +19,6 @@

    int selectCountByMac(Map<String, Object> params);

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

}