From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 656ff83..bc578ee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -572,7 +572,7 @@
 		// 娣樺疂api鎼滅储鍟嗗搧
 		TaoBaoSearchResult result = TaoBaoUtil.search(sf);
 
-		// 鎼滅储鏄惁鍦ㄨ惀閿�涓诲晢鍝佸簱
+		// 鎼滅储缁撴灉缂撳瓨鍒皉edis
 		if (result != null && result.getTaoBaoGoodsBriefs() != null && result.getTaoBaoGoodsBriefs().size() > 0) {
 			ThreadUtil.run(new Runnable() {
 				@Override

--
Gitblit v1.8.0