From 8f84f110e635237eace24f0077e9ab8f6b53d480 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 17:33:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index ed79d4c..61415a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -385,7 +385,7 @@
 						inner.put("link", userVipConfigService.getValueByKey("vip_link"));
 						inner.put("ion", "http://img.flqapp.com/resource/vip/icon_tearcher.png");
 						inner.put("title", "鎷夸簲闄╀笌娲ヨ创 浜甯堟潈鐩�");
-						inner.put("btnName", "鍗囩骇浼氬憳");
+						inner.put("btnName", "鍗囩骇瀵煎笀");
 					} else {
 						UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);
 						if (userVIPPreInfo != null) {

--
Gitblit v1.8.0