Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java

@@ -69,5 +69,19 @@
    * @param listCommonGoods

    */

   public void addBatchCommonGoods(List<CommonGoods> listCommonGoods);

	
   /**

    *  根据店铺id查询 最新5个

    * @param sellerId

    * @return

    */

   public List<CommonGoods> listBySellerId(Long sellerId);



   /**

    * 统计店铺商品有券数量

    * @param sellerId

    * @return

    */

   public long countBySellerIdAndHasCoupon(Long sellerId);



}