From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div
---
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 767ac50..9a5e6d9 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
@@ -77,7 +77,7 @@
* out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
* return; }
*/
- List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4); // 杩斿埄鍒竌pp
+ List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4, null); // 杩斿埄鍒竌pp
if (superHotSearchList == null || superHotSearchList.size() == 0) {
out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NODATA));
return;
--
Gitblit v1.8.0