From 94c29daf7cb722635c1735e8d8bd403105e999d8 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 15:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java
index 8f14a25..18777c0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/DynamicRecommendAdminController.java
+++ b/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;
 

--
Gitblit v1.8.0