Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

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