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

cjl

2023-07-21 1393ec7b94738419acbfd340cf24d3debaa2b73e

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

}