From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
index a8918dd..767ac50 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxSearchController.java
@@ -177,7 +177,7 @@
return;
}
- String kw = goodsClassService.getKwById(id);
+ String kw = goodsClassService.getKeysById(id);
filter = "[{\"type\": \"quantype\"}]";
JSONObject data = search(kw, pagesize, filter, order, startprice, endprice);
// if (StringUtil.isNullOrEmpty(kw)) {
--
Gitblit v1.8.0