From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +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/v1/ConfigController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index be3ce47..f5dc23a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -154,7 +154,8 @@
} else {// 鑰佷汉
data.put("userTimeType", 1);
}
- data.put("hotFuctionLink", configService.get("hot_function_url"));
+ data.put("hotFuctionLink",
+ configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));//
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0