Merge remote-tracking branch 'origin/master'

admin

2019-01-26 b8d98797f162f34ce0e4245b0d879ea0e6a30db0

 fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java

@@ -22,7 +22,6 @@
import com.yeshi.fanli.service.inter.config.JumpDetailService;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

import com.yeshi.fanli.service.inter.config.SystemService;

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

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

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

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

@@ -104,8 +103,6 @@
   @Resource

   private SystemConfigService systemConfigService;



   @Resource

   private HonestService honestService;