From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java |    6 +++++-
 1 files changed, 5 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 e40aa51..40995b6 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
@@ -150,6 +150,7 @@
 	userProtocolHomeData("user_protocol_home_data", "鐢ㄦ埛鍗忚棣栭〉鍐呭"),
 	serviceProtocolLink("service_protocol_link", "鏈嶅姟鍗忚"),
 	privacyProtocolLink("privacy_protocol_link", "闅愮鍗忚"),
+	accountLogoutProtocolLink("account_logout_protocol_link", "璐︽埛娉ㄩ攢鍗忚"),
 
 	shareOpenJD("share_jd_open", "浜笢鍟嗗搧鏄惁寮�鍚垎浜�"),
 	jdApiSearchKey("jd_api_search_key", "浜笢API鏄惁鎼滅储"),
@@ -225,7 +226,10 @@
 	
 	cloudAlipayJumpLink("cloud_alipay_jump_link","浜戝彂鍗曟敮浠樿烦杞湴鍧�"),
 	cloudAlipayReturnLink("cloud_alipay_return_link","浜戝彂鍗曟敮浠樻垚鍔熷悗杩斿洖鍝釜鍓嶇椤甸潰"),
-	cloudAlipayNotifyLink("cloud_alipay_notify_link","浜戝彂鍗曟敮浠樻垚鍔熷悗鍥炶皟鍦板潃");
+	cloudAlipayNotifyLink("cloud_alipay_notify_link","浜戝彂鍗曟敮浠樻垚鍔熷悗鍥炶皟鍦板潃"),
+	
+	clipboardRecommendGoodsMakeMore("clipboard_recommend_goods_make_more_link","鏍规嵁绮樿创鏉挎帹鑽愬晢鍝佽禋鏇村閾炬帴")
+	;
 	
 	
 	

--
Gitblit v1.8.0