From b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2019 17:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |    4 ++--
 1 files changed, 2 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 45f7456..b949926 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
@@ -162,9 +162,9 @@
 	 * @param lableName 鏍囩鍚�
 	 * @return
 	 */
-	public List<QualityFactory> listFreeGoods(long start, int count, Double tkRate, String lableName);
+	public List<QualityFactory> listFreeGoods(long start, int count);
 
-	public long countFreeGoods(Double tkRate, String lableName);
+	public long countFreeGoods();
 	
 	/**
 	 * 闄愭椂绉掓潃闅忔満3涓晢鍝�

--
Gitblit v1.8.0