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

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java

@@ -162,9 +162,9 @@
    * @param lableName 标签名

    * @return

    */

   public List<QualityFactory> listFreeGoods(long start, int count, Double tkRate, String lableName);

   public List<QualityFactory> listFreeGoods(long start, int count);



   public long countFreeGoods(Double tkRate, String lableName);

   public long countFreeGoods();

   

   /**

    * 限时秒杀随机3个商品