Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

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

@@ -239,11 +239,10 @@
      JSONObject data = null;

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {

         data = JSONObject.fromObject(androidBuilder.excludeFieldsWithoutExposeAnnotation().create().toJson(num));

         data.put("totalCount", totalCount > 99 ? "99+" : totalCount);

      } else {

         data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));

         data.put("totalCount", totalCount);

      }

      data.put("totalCount", totalCount);



      try {

         UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);