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

admin

2020-01-08 dddbd7fc24aec7d71522641da8bf3804b1b858fd

 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;