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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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