Merge remote-tracking branch 'origin/master'

admin

2019-01-26 b8d98797f162f34ce0e4245b0d879ea0e6a30db0

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

@@ -57,6 +57,10 @@
      JSONObject data = new JSONObject();

      if (appHomeFloatImg != null)

         data.put("floatImg", appHomeFloatImg);

      String notifyImg = configService.getAppHomeFloatNotifyImg();

      if (!StringUtil.isNullOrEmpty(notifyImg)) {

         data.put("floatNotifyImg", notifyImg);

      }

      out.print(JsonUtil.loadTrueResult(data));

   }