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 | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 d497826..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鏄惁鎼滅储"),
@@ -199,6 +200,8 @@
evaluateEmojis("evaluate_emojis", "鍙戝湀璇勮Emojis"),
evaluateText("evaluate_text", "鍙戝湀璇勮鏂囨湰"),
+ evaluateZeroKey("evaluate_zero_key", "0鐐瑰尮閰嶈瘝"),
+
vipUpgradeLink("vip_upgrade_link", "鎴戠殑鐣岄潰-浼氬憳鍗囩骇閾炬帴"),
@@ -214,11 +217,19 @@
testUserArray("test_user_array","娴嬭瘯鐢ㄦ埛鏁扮粍"),
- robotCloudOpen("robot_cloud_open","浜戝彂鍗曟槸鍚﹀紑鍚�"),
robotCloudLink("robot_cloud_link","浜戝彂鍗曢摼鎺�"),
+ robotCloudOpen("robot_cloud_open","浜戝彂鍗曟槸鍚﹀紑鍚�-鎴戠殑鐣岄潰"),
+ robotCloudOpenCircle("robot_cloud_open_circle","浜戝彂鍗曟槸鍚﹀紑鍚�-鍙戝湀鐣岄潰"),
+ robotCloudOpenGoodsDetail("robot_cloud_open_goods_detail","浜戝彂鍗曟槸鍚﹀紑鍚�-鍟嗗搧璇︽儏"),
+ robotCloudGroupPictureNum("robot_cloud_group_picture_num","浜戝彂鍗曠兢鍥剧墖鏁伴噺"),
+
+
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