Merge remote-tracking branch 'origin/div' into div

admin

2019-08-26 4f0197ad8aeb2dd13929d2f656d80265263775ed

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

   
   /**