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

luodangjia

2024-07-17 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8

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

@@ -245,14 +245,9 @@
        }

        orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1);



        if(orderPrivateCar.getArriveTime()==null){
            orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
        }
        orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
        tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);

        return SUCCESS_TIP;
    }
    @Resource