Merge remote-tracking branch 'origin/master'

yujian

2019-07-16 810d27d204e9b993840cf789e77e6bd301d0c1b7

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java

@@ -19,7 +19,6 @@
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.taobao.SearchFilter;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

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

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