Merge branch 'subsidy_sku_func' into pre

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

@@ -25,7 +25,7 @@ public class GoodsDonSkuSubsidyDetailView {
 	/**
 	 * 规格补贴id
 	 */
-	@DbField("gs.subsidy_id")
+	@DbField("gs.id")
 	private Long subsidyId;
 
 	@DbField("sku.id")