Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

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

@@ -180,6 +180,12 @@
            hasCode = true;   // 已有邀请码

         }

      }

		
      // 邀请激活链接

      if (!hasCode) {

         data.put("activationlink", configService.get("invite_activation_url"));

      }

		
      data.put("hasCode", hasCode);