Merge branch 'div' into master-new

yujian

2019-05-27 cdd6fcbe04df08005d1298ed4b967c37052ab2b4

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