Merge remote-tracking branch 'origin/wb' into wb

cjl

2023-09-28 39dc3d6f7168eae8fda1b0fe6671be819d35c732

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

}