From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index 8c437eb..f5cdc0e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -1131,7 +1131,7 @@
}
}
title = title.replace("銆愰個璇风爜銆�", inviteCode);
- title = title.replace("銆愰個璇烽摼鎺ャ��", UserUtil.getInviteShortLink(uid));
+ title = title.replace("銆愰個璇烽摼鎺ャ��", Constant.YINGYONGBAO_LINK);
data.put("title", title);
} else { // 鏈夊浘鍒嗕韩
--
Gitblit v1.8.0