From 5cdd46435f18f3615919aa5a0b8c6e49c539ef69 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 14:58:11 +0800
Subject: [PATCH] 解决冲突
---
fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
index dbf7e42..e874647 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/DynamicRecommendController.java
@@ -31,7 +31,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.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
@@ -40,15 +39,12 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.DynamicRecommendService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/dynamic")
--
Gitblit v1.8.0