From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityTaoBaoGoodsMapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 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..a7cda5c 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
@@ -28,6 +28,8 @@
 	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