Merge remote-tracking branch 'origin/div' into div

admin

2019-07-30 cebb70396a159270ce84cb44caeafa82faa439a4

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

@@ -25,9 +25,10 @@

   int updateStateByAuctionId(@Param("auctionId") Long auctionId, @Param("state") int state);

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