From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
index d85a61b..7c676e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
@@ -312,10 +312,9 @@
* @param count
* @return
*/
- List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count,
- @Param("tkRate") Double tkRate, @Param("lableName") String lableName);
+ List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count);
- long countFreeGoods(@Param("tkRate") Double tkRate, @Param("lableName") String lableName);
+ long countFreeGoods();
/**
--
Gitblit v1.8.0