From 11c098089f8c4714188e91032e5a19e8fe94bf96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 22 八月 2019 09:26:52 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
index 783f09c..a0301d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -111,6 +111,7 @@
* @param page
* @param out
*/
+// @RequestSerializableByKey(key="#acceptData.device")
@RequestMapping(value = "getTaskList", method = RequestMethod.POST)
public void getTaskList(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
if (uid == null || uid <= 0) {
@@ -527,7 +528,6 @@
try {
record = integralGetService.addEventStatistic(uid, event, null);
} catch (IntegralGetException e) {
- e.printStackTrace();
}
if (record == null) {
out.print(JsonUtil.loadFalseResult("娣诲姞澶辫触"));
--
Gitblit v1.8.0