Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-22 c3e8b19537332aa0e5282cae78d3ea9c9189fd4e

 screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java

@@ -8,4 +8,7 @@
    //5分钟数据insert
    void insertHistoryFiveMinutely();


    void insertHistoryFiveMinutely(String yz,String mac);

}