Merge branch 'div'

yujian

2019-01-29 c12c7cd45e9abb70c07be432b5c88754ae9120e3

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java

@@ -28,6 +28,8 @@
   List<TaoBaoGoodsBrief> getTaoBaoGoodsBriefByActivityId(Long activityId);

   List<RecommendActivityTaoBaoGoods> selectByActivityId(Long activityId);
	
   List<RecommendActivityTaoBaoGoods> selectByAuctionId(Long auctionId);

   List<RecommendActivityTaoBaoGoods> selectList(@Param("start") Long start, @Param("count") int count);