Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-31 4f7ce4b7d2ad52f118c13e0f9f6fb2efd5b296ff

 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java

@@ -28,7 +28,7 @@
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;