From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 30 七月 2019 09:07:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java | 11 ++--------- 1 files changed, 2 insertions(+), 9 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 546521c..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 @@ -77,12 +77,6 @@ // 绮鹃�夊簱鏌ヨ -- 鏌ヨ鎵�鏈� List<QualityFactory> queryAll(@Param("start") long start, @Param("count") int count, @Param("days") Integer days); - // 寰呮洿鏂扮簿閫夊晢鍝乮d - List<Long> queryNeedUpdate(@Param("start") long start, @Param("count") int count, @Param("hour") int hour); - - // 缁熻闇�鏇存柊鍟嗗搧鏁伴噺 - long countQueryNeedUpdate(); - // 绮鹃�夊簱鏌ヨ List<QualityFactory> query(QualityFactoryVO qualityFactoryVO); @@ -318,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