Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

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

@@ -201,4 +201,16 @@
    * @return

    */

   public List<QualityFactory> listFlashSaleRandGoods();

	
	
   /**

    * 根据店铺id查询

    * @param start

    * @param count

    * @param shopId

    * @return

    */

   public List<QualityFactory> listByShopId(long start, int count, Long shopId);

	
   public long countByShopId(Long shopId);

}