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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -409,7 +409,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             csv.initParamJson();
             //设置明细
             orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
-                setId(orderMQDTO.getId());
+                setId(orderMQDTO.getDetailId());
                 handelCostDetailExtend(csv);
             }});