Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

admin

2019-08-26 caafa321a29b1224b3fd97c0ff62dcc304483948

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

@@ -5,7 +5,6 @@
import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

public interface RecommendActivityTaoBaoGoodsMapper {