From 2bd2200f209ddb7bcc59b636d9de6f8b3f762958 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 10:00:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 6788716..36d47a1 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
@@ -162,6 +162,7 @@
pushGoodsDetails("push_goods_details", "鎺ㄩ�侀〉闈�"),
brandBackgroundPicture("brand_background_picture", "鍝佺墝鑳屾櫙鍥剧墖"),
articleHotWords("article_hot_words", "鍔ㄦ��-瀛﹂櫌鏂囩珷鐑悳璇�"),
+ inviteRules("invite_rules", "鍔ㄦ��-瀛﹂櫌鏂囩珷鐑悳璇�"),
vipLink("vip_link", "瓒呯骇浼氬憳鍗囩骇閾炬帴"), // 杞Щ鑷砎IPConfig 宸插簾寮�
helpLinkVipInfo("help_link_vip_info", "瓒呯骇浼氬憳璇︽儏椤靛府鍔╅摼鎺�"), // 宸插簾寮�
//鏂囨杞摼
@@ -174,6 +175,21 @@
quickShareTBCommentText("quick_share_tb_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
quickShareJDCommentText("quick_share_jd_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
quickSharePDDCommentText("quick_share_pdd_comment_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
+
+ shareCommentTextTB("share_comment_text_tb", "娣樺疂鍗曞浘澶氬浘鍒嗕韩鍟嗗搧鏂囨湰"),
+ shareCommentTextJD("share_comment_text_jd", "浜笢鍗曞浘澶氬浘鍒嗕韩鍟嗗搧鏂囨湰"),
+ shareCommentTextPDD("share_comment_text_pdd", "鎷煎澶氬崟鍥惧鍥惧垎浜晢鍝佹枃鏈�"),
+
+ evaluateEmojis("evaluate_emojis", "鍙戝湀璇勮Emojis"),
+ evaluateText("evaluate_text", "鍙戝湀璇勮鏂囨湰"),
+
+
+ vipUpgradeLink("vip_upgrade_link", "鎴戠殑鐣岄潰-浼氬憳鍗囩骇閾炬帴"),
+
+ orderRebateDescLink("order_rebate_desc_link", "璁㈠崟杩斿埄璁＄畻璇存槑閾炬帴"),
+ bonusCountLinkFanli("bonus_count_link_fanli", "鑷喘杩斿埄缁熻椤甸潰闂彿"),
+ bonusCountLinkShare("bonus_count_link_share", "鍒嗕韩濂栭噾缁熻椤甸潰闂彿"),
+ bonusCountLinkTeam("bonus_count_link_team", "鍥㈤槦濂栧姳缁熻椤甸潰闂彿"),
;
private final String key;
--
Gitblit v1.8.0