From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 7faf1ba..c5ef4fa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -626,6 +626,13 @@
if (filter.getEndTkRate() > 0)
map.put("end_tk_rate", filter.getEndTkRate() + "");
+
+
+ if (filter.getStartKaTkRate() > 0)
+ map.put("start_ka_tk_rate", filter.getStartKaTkRate() + "");
+
+ if (filter.getEndKaTkRate() > 0)
+ map.put("end_ka_tk_rate", filter.getEndKaTkRate() + "");
if (filter.isTmall())
map.put("is_tmall", filter.isTmall() + "");
@@ -729,7 +736,7 @@
// 璁剧疆鍙戣揣鍦板潃
TaoBaoSearchNav nav = new TaoBaoSearchNav();
- nav.setName("鍙戣揣鍦�");
+ nav.setName("鍙戣揣鍦伴�夋嫨");
nav.setFlag("address");
nav.setId(11110);
nav.setType("fahuodi");
--
Gitblit v1.8.0