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

admin

2020-05-12 522315ae42936583042fc08aabda7e3c9e7a7b5d

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -2199,6 +2199,10 @@
            data.put("inviteLevel", inviteLevel);

         }



         if (VersionUtil.greaterThan_2_1_1(acceptData.getPlatform(), acceptData.getVersion())) {

            data.put("fansCountLink", configService.get(ConfigKeyEnum.teamStatisticsLink.getKey()));

         }



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



         final UserInfo uuser = userInfo;

@@ -2220,7 +2224,7 @@
         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("获取失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }