Merge remote-tracking branch 'origin/master'

admin

2019-03-01 a5b74cb17159f71dac98b3e7ae81e43fce73a3f9

 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);