Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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);

   // 待更新精选商品id
   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();

   
   /**