From 45f35a348c6d19f954888bf3e595bdf9d6016bb8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 16:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
index 341c4b1..a7d6446 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java
@@ -28,6 +28,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -114,7 +115,7 @@
}
}
- pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+ pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
} else {// 灏氭湭缁戝畾
isNative = true;
@@ -194,7 +195,7 @@
* @param out
*/
@RequestMapping(value = "isGoodsExtend")
- public void isGoodsExtend(String goodsId, String goodsType, PrintWriter out) {
+ public void isGoodsExtend(AcceptData acceptData,String goodsId, String goodsType, PrintWriter out) {
if (StringUtil.isNullOrEmpty(goodsId)) {
out.print(JsonUtil.loadFalseResult(1, "鏈弬涓庢帹骞�"));
return;
--
Gitblit v1.8.0