From 4f0197ad8aeb2dd13929d2f656d80265263775ed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 17:26:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 1c074e6..9ae58ea 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
@@ -218,9 +218,10 @@
 	public long countQueryEverydayRob(BigDecimal zkPrice, BigDecimal minQuanPrice, BigDecimal maxQuanPrice);
 	
 	/**
-	 * 
+	 * 棣栭〉鎺ㄨ崘
 	 * @param start
 	 * @param count
+	 * @param proportion
 	 * @return
 	 */
 	public JSONArray getRecommendToIndexV2(long start, int count);

--
Gitblit v1.8.0