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

cjl

2023-07-27 7e5452d35bb30dad5bc9e37360047b5a43732dcd

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

}