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

chen_xi

2022-09-27 f4ab89e7032bea8d3c7e05a44946c3fdb58b7473

 screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java

@@ -17,7 +17,7 @@
public interface SpecialDeviceService extends IService<SpecialDevice> {

    //获取该组织下所有走航车设备列表
    List<Map<String, Object>> getCarsInfo();
    List<Map<String, Object>> selectCruisers();

    //走航车轨迹
    List<Map<String, Object>> carTrajectory(Map<String, Object> params);