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

jinpengyong

2023-09-05 f3ddba24738e32305ea27eec3ca4c0e1253086d7

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

}