Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-14 8e751a7ee99afce71ac615a6111228c5c785ee46

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

   
   /**