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

admin

2019-09-17 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java

@@ -30,7 +30,7 @@
import com.yeshi.fanli.service.inter.goods.JDCommonTemplateContentService;

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

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;