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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

 screen-manage/src/main/java/com/moral/api/service/HistorySecondCruiserService.java

@@ -26,4 +26,7 @@

    //查询走航车轨迹
    Map<String,Object> getCruiserInFo(Map<String, Object> params);


    Map<String,Object> getCruiserCompare(Map<String, Object> params);
}