Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-11-07 dab06e44d031aac4a951cfb01ba9545cc4772fa2

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

}