Merge remote-tracking branch 'origin/div' into div

admin

2019-11-20 100c4cdf73b6df2766e37f65a801ce59cf07869f

 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 {