From 4c4646819beb205c070c34737c0b94d7084d548f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.1.106>
Date: 星期二, 03 三月 2020 13:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index a8c5d4a..d267f6b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -239,7 +239,7 @@
// 2.0.7杩斿洖鍙戝湀+娲诲姩+瀛﹂櫌+绱犳潗
list.add(map.get(TYPE_FAQUAN));
list.add(map.get(TYPE_HUODONG));
- // list.add(map.get(TYPE_XUEYUAN));
+// list.add(map.get(TYPE_XUEYUAN));
list.add(map.get(TYPE_SUCAI));
} else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -675,6 +675,7 @@
data.put("list", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
+ e.printStackTrace();
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ淇℃伅澶辫触"));
LogHelper.errorDetailInfo(e);
}
--
Gitblit v1.8.0