From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
index a48d47b..ae4d415 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
@@ -217,7 +217,6 @@
 	
 	public long countQueryEverydayRob(BigDecimal zkPrice, BigDecimal minQuanPrice, BigDecimal maxQuanPrice);
 	
-	
 	/**
 	 * 棣栭〉鎺ㄨ崘
 	 * @param start
@@ -225,5 +224,5 @@
 	 * @param proportion
 	 * @return
 	 */
-	public JSONArray getRecommendToIndexV2(long start, int count);
+	public JSONArray getRecommendToIndexV2(long start, int count,String platform,String version);
 }

--
Gitblit v1.8.0