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

admin

2019-07-23 dc675e0c19849b1d1a77c64f0b5c6a25eb91ace2

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

@@ -25,7 +25,6 @@

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

   List<TaoBaoGoodsBrief> getTaoBaoGoodsBriefByActivityId(Long activityId);

   List<RecommendActivityTaoBaoGoods> selectByActivityId(Long activityId);