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

cjl

2023-08-02 ee2d9a4049baa9ecc3f43d0576fd3745688171be

 screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java

@@ -5,7 +5,10 @@
    //5分钟表创建
    void createTable(String timeUnits);

    //5分钟数据统计
    //5分钟数据insert
    void insertHistoryFiveMinutely();


    void insertHistoryFiveMinutely(String yz,String mac);

}