Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 0485fe81732a49c91a0c1e8628ad90ca72458e55

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

   
   /**