From cc88c71f8c92fab3cc17381b4a75eee7acc9a642 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 六月 2019 10:08:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
index 0edeabf..3728429 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
@@ -365,13 +365,13 @@
}
@Override
- public List<QualityFactory> listFreeGoods(long start, int count, Double tkRate, String lableName) {
- return qualityFactoryMapper.listFreeGoods(start, count, tkRate, lableName);
+ public List<QualityFactory> listFreeGoods(long start, int count) {
+ return qualityFactoryMapper.listFreeGoods(start, count);
}
@Override
- public long countFreeGoods(Double tkRate, String lableName) {
- return qualityFactoryMapper.countFreeGoods(tkRate, lableName);
+ public long countFreeGoods() {
+ return qualityFactoryMapper.countFreeGoods();
}
@Override
--
Gitblit v1.8.0