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

cjl

2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e

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