Merge branch 'master' into pre

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

@@ -194,6 +194,9 @@ public class GoodsDonViewer {
     @DbField("g.third_exchange_url")
     private String thirdExchangeUrl;
 
+    @DbField("g.third_party_purchase_url")
+    private String thirdPartyPurchaseUrl;
+
     @DbField("g.special_type")
     private GoodsDon.SpecialType specialType;
 

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

@@ -18,7 +18,7 @@ import java.util.Date;
 @SearchBean(tables = "goods_don g left join goods_don_category_relate gcr on gcr.goods_id = g.id" +
 		" left join goods_don_category gc on gc.id = gcr.category",
 		where = ":condition:",
-		groupBy = "g.id,g.title,g.status,g.deleted,g.logo,g.type,g.sort_by,g.virtual_sold,g.created_time,g.update_time")
+		groupBy = "g.id,g.title,g.status,g.deleted,g.logo,g.type,g.sort_by,g.virtual_sold,g.created_time,g.update_time,g.third_party_purchase_url,g.third_exchange_url")
 public class GoodsDonCategoryDetailView {
 	@DbField("g.id")
 	private Long id;
@@ -63,6 +63,12 @@ public class GoodsDonCategoryDetailView {
 	@DbField("g.virtual_sold")
 	private Integer virtualSold;
 
+	@DbField("g.third_party_purchase_url")
+	private String thirdPartyPurchaseUrl;
+
+	@DbField("g.third_exchange_url")
+	private String thirdExchangeUrl;
+
 	@DbField("g.special_type")
 	private String specialType;