Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

 fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java

@@ -51,6 +51,8 @@
   @RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)

   public void getHomeConfig(AcceptData acceptData, PrintWriter out) {

      AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();

      if ("ios".equalsIgnoreCase(acceptData.getPlatform()))

         appHomeFloatImg = null;

      JSONObject data = new JSONObject();

      if (appHomeFloatImg != null)

         data.put("floatImg", appHomeFloatImg);