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

jinpengyong

2023-09-28 5eb88939c094fac1f5dc9201b5af6da4165cc185

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

}