Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

 fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java

@@ -15,6 +15,8 @@
import org.springframework.web.bind.annotation.RequestMethod;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.multipart.commons.CommonsMultipartFile;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.entity.bus.recommend.DynamicRecommend;

import com.yeshi.fanli.entity.bus.recommend.MaskKey;

@@ -23,7 +25,6 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;

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

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

import com.yeshi.fanli.exception.HongBaoManageException;

import com.yeshi.fanli.service.MaskKeyService;

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

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

@@ -35,8 +36,6 @@
import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

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

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;



import net.sf.json.JSONObject;