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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

}