From d3a5dfe218fdee554decdd58a3c995e03bc1dec1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 六月 2020 14:12:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java
index 87d6817..68ce0a8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java
@@ -213,7 +213,13 @@
 	showSplashAd("show_splash_ad","鏄惁鏄剧ず寮�灞忓箍鍛�"),
 	
 	robotCloudOpen("robot_cloud_open","浜戝彂鍗曢摼鎺�"),
-	robotCloudLink("robot_cloud_link","浜戝彂鍗曢摼鎺�");
+	robotCloudLink("robot_cloud_link","浜戝彂鍗曢摼鎺�"),
+	cloudAlipayJumpLink("cloud_alipay_jump_link","浜戝彂鍗曟敮浠樿烦杞湴鍧�"),
+	cloudAlipayReturnLink("cloud_alipay_return_link","浜戝彂鍗曟敮浠樻垚鍔熷悗杩斿洖鍝釜鍓嶇椤甸潰"),
+	cloudAlipayNotifyLink("cloud_alipay_notify_link","浜戝彂鍗曟敮浠樻垚鍔熷悗鍥炶皟鍦板潃");
+	
+	
+	
 
 	private final String key;
 	private final String desc;

--
Gitblit v1.8.0