Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java

@@ -158,9 +158,14 @@
      return commonGoodsMapper.listBySellerId(sellerId);

   } 

   

	
   @Override

   public long countBySellerIdAndHasCoupon(Long sellerId) {

      return commonGoodsMapper.countBySellerIdAndHasCoupon(sellerId);

   }

	
   @Override

   public List<CommonGoods> getByListGoodsId(List<Long> list) {

      return commonGoodsMapper.getByListGoodsId(list);

   }

	
}