Merge remote-tracking branch 'origin/master'

Administrator

2018-11-28 6bb5a38680f204f12a0594c8c7b4ea3901894006

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

@@ -1646,6 +1646,11 @@
      

      JSONObject resultData = new JSONObject();

      

      String helpLink = configService.get("team_help_url");

      if (helpLink == null) {

         helpLink = "";

      }

      resultData.put("helpLink", helpLink);

      resultData.put("firstTeam", firstTeam);

      resultData.put("firstTeamTotal", firstTeamTotal);

      resultData.put("secondTeam", secondTeam);