fix bug

mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java

@@ -16,8 +16,8 @@ public class WxCouponMerchant extends TenantEntity {
 
 	@io.swagger.annotations.ApiModelProperty(value="",name="productId")
 	private Long productId;
-//	@io.swagger.annotations.ApiModelProperty(value="",name="merchantId")
-//	private Long merchantId;
+	@io.swagger.annotations.ApiModelProperty(value="",name="merchantId")
+	private Long merchantId;
 	@io.swagger.annotations.ApiModelProperty(value="",name="parameter")
 	private String parameter;