Merge remote-tracking branch 'origin/master'

admin

2019-01-28 17e37be36258cf2370f32c1a7ca44964820ef2dc

Merge remote-tracking branch 'origin/master'

 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);