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

luodangjia

2024-07-17 736ab0090700c75af37b8a3456b01609e4e2d329

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java

@@ -120,7 +120,7 @@

        //修改行程信息
        try {
            fleetEngineUtil.updateTrip("CANCELED", null, null, 4, tOrderLogistics.getId(), null, null, null, null);
            fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderLogistics.getTripId(), null, null, null, null);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }