Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

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

@@ -190,6 +190,11 @@
             + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);

      data.put("inviteLink", shortLink);

      

      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

      if (userInfoExtra != null) {

         data.put("inviteCode", userInfoExtra.getInviteCode());

      }

		
      // 邀请规则

      String key = "inviteRules"; // key值

      BusinessSystem system = new BusinessSystem();