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

xuhy

8 小时以前 3b6789ae8cb8138533b2cc362f37ad94b605a58d

 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarConfirmController.java

@@ -203,6 +203,8 @@
        orderPrivateCar.setAbnormalMoney(orderPrivateCar.getOrderMoney());
        orderPrivateCar.setOrderMoney(money);
        orderPrivateCar.setIsException(0);
        orderPrivateCar.setPriceAuditState(2);
        orderPrivateCar.setState(7);
        orderPrivateCar.updateById();
        // 推送消息
        TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar;