Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-11 8b505f74e1094fd67f86373ab9e9f80b54bca54e

 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));

   }