Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java

@@ -26,4 +26,14 @@
    * @return
    */
   long countBySellerIdAndHasCoupon(@Param("sellerId") Long sellerId);
	
	
   /**
    * 批量商品id查询商品信息
    * @param list
    * @return
    */
   List<CommonGoods> getByListGoodsId(@Param("list") List<Long> list);
		
	
}