From a6b1160da8cbb78a664a6dd7496bee648c7c148c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 17:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index b54d921..11a0e3f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/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);
--
Gitblit v1.8.0