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

admin

2019-08-22 0753e8e2febe83f13d9d7a6071fa5f7b57d7d7f1

 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 {