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

jinpengyong

2023-08-18 4a64c0801f147536ed0a9d09977941f313a286ae

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

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

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