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

yujian

2019-10-11 0291f92c5d472aa979e830f15874427c61c2aaae

 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java

@@ -28,7 +28,7 @@
import com.yeshi.fanli.service.inter.config.CustomerContentService;

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

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

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

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

import com.yeshi.fanli.service.inter.user.HistorySearchService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;