Merge branch 'dev1'

Administrator

2018-12-06 1770eb0a01b3f2ef92f416b67d25160d3ced9625

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java

@@ -16,7 +16,6 @@
import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.service.inter.activity.ActivityService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;