Merge remote-tracking branch 'origin/div' into div

admin

2019-09-27 6b75391e97aa770e12965ec6e542856df79e6de0

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

   }