From df7554c138d0366514968eba9a32670876510df7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 二月 2020 14:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java
index 1b924ab..26eeca8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/RecommendController.java
@@ -137,7 +137,6 @@
params = JSONObject.fromObject(swiper.getParams());
}
swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
- swiper.setParams(null);
}
// 鍦嗗舰涓撻
@@ -157,7 +156,6 @@
}
special.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(jumpDetail));
- special.setParams(null);
}
// 娲诲姩
@@ -172,7 +170,6 @@
params = JSONObject.fromObject(swiper.getParams());
}
swiper.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(swiper.getJumpDetail()));
- swiper.setParams(null);
}
JSONObject data = new JSONObject();
@@ -221,6 +218,7 @@
JSONObject data = new JSONObject();
data.put("list", new JSONArray());
data.put("count", 0);
+ data.put("page", page);
out.print(JsonUtil.loadTrueResult(data));
}
}
@@ -260,6 +258,7 @@
data.put("list", array);
data.put("count", count);
+ data.put("page", page);
out.print(JsonUtil.loadTrueResult(data));
}
@@ -292,6 +291,7 @@
JSONObject data = new JSONObject();
data.put("list", array);
data.put("count", count);
+ data.put("page", page);
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0