From ca81ac257960fcb135fe542a49c28bc871b14e2a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index c144ab7..1d2e782 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -115,7 +115,7 @@
@RequestMapping(value = "testactivity")
public void test2(PrintWriter out) {
List<RecommendActivity> list = activityService.getRecommendActivityList(1, Constant.PAGE_SIZE);
- long count = activityService.getRecommendActivityCount();
+ long count = activityService.getRecommendActivityCount(null);
JSONObject data = new JSONObject();
data.put("data", getGson().toJson(list));
data.put("count", count);
--
Gitblit v1.8.0