fix 合并冲突

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -3600,14 +3600,5 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 	}
 
-	/**
-	 * 试用车票跳转购买正式车票订单记录
-	 */
-	public void recordOrderTrialTicketJumpPay(Boolean isTrial, Long orderId) {
-		if (isTrial != null && isTrial) {
-			UserTrialTicketJumpPayRecord userTrialTicketJumpPayRecord = new UserTrialTicketJumpPayRecord();
-			userTrialTicketJumpPayRecord.setOrderId(orderId);
-			userTrialTicketJumpPayRecordMapper.insert(userTrialTicketJumpPayRecord);
-		}
-	}
+
 }