From 21a5d62894e6cca7d536ffcc1d63898ffaf16185 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 11:41:17 +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