Merge branch 'master' into pre

netflix-dao/src/main/java/com/cyksj/model/views/TicketView.java

@@ -38,6 +38,12 @@ public class TicketView {
 	@DbField("gdk.spec_val")
 	private String specVal;
 
+	/**
+	 * 第三方兑换网址
+	 */
+	@DbField("gd.third_exchange_url")
+	private String thirdExchangeUrl;
+
 	/**
 	 * 主账号
 	 */

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -1136,7 +1136,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.field("condition", String.format("(gr.expiry_time is null or gr.expiry_time > '%s')", DateTime.now()))
 				.field(RenewalView::getStatus, List.of("validity", "outside")).op(Operator.InList)
 				.orderBy(RenewalView::getExpiryTime).asc()
-				.onlySelect(RenewalView::getRelationId, RenewalView::getExpiryTime, RenewalView::getTitle, RenewalView::getSpecVal, RenewalView::getGoodsId, RenewalView::getSkuId, RenewalView::getSkuNum, RenewalView::getSkuStatus, RenewalView::getGoodsStatus)
+				.onlySelect(RenewalView::getRelationId, RenewalView::getExpiryTime, RenewalView::getTitle, RenewalView::getSpecVal, RenewalView::getThirdExchangeUrl, RenewalView::getGoodsId, RenewalView::getSkuId, RenewalView::getSkuNum, RenewalView::getSkuStatus, RenewalView::getGoodsStatus)
 				.build());
 		if (renewalView != null) {
 			renewalView.setExpiryTimeStr(DateUtil.format(renewalView.getExpiryTime(), "yyyy-MM-dd"));