Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-31 2a0298bb6ce4584ba311d7eba8454f515d2b0b3c

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

@@ -295,8 +295,8 @@
        OrderCancel orderCancel = new OrderCancel();
        orderCancel.setOrderId(tOrderPrivateCarId);
        orderCancel.setOrderType(1);
        orderCancel.setReason("平台取消订单");
        orderCancel.setRemark("平台取消订单");
        orderCancel.setReason("The platform cancels the order");
        orderCancel.setRemark("The platform cancels the order");
        orderCancel.setUserType(2);
        orderCancel.setState(2);
        orderCancel.setInsertTime(new Date());