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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

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

@@ -25,5 +25,8 @@
    List<SpecialDevice> selectCruisers();

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


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