From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java
index 881aa89..66b45c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java
+++ b/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);
 

--
Gitblit v1.8.0