Merge branch 'ad_type'

netflix-dao/src/main/java/com/cyksj/model/entity/HomeManagementConfig.java

@@ -115,6 +115,7 @@ public class HomeManagementConfig extends BaseEntity{
 		pcSec("pc首页副"),
 		pcDis("pc发现首页"),
 		h5Sec("h5副广告"),
+		h5Banner("H5横幅广告")
 		;
 		String desc;
 

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

@@ -28,6 +28,15 @@ public class GoodsDiscountPlusPurchaseRelationFrontView {
 	@DbField("g.title")
 	private String title;
 
+	@DbField("sku.sub_title")
+	private String subTitle;
+
+	@DbField("sku.picture")
+	private String picture;
+
+	@DbField("sku.img")
+	private String img;
+
 	/**
 	 * 匹配图
 	 */