Merge remote-tracking branch 'origin/wb_21' into qa

jinpengyong

2023-08-22 6eb8f65d4a69a550945a92cc916d3c63dee739fa

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

}