From c04a59775ee986f33fe19e21ae02cff9f6b002a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java | 10 +++++++++-
1 files changed, 9 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 b5afe5d..4fac403 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
@@ -102,6 +102,7 @@
taobaoOrderParseJS("taobao_order_parse_js", "娣樺疂璁㈠崟瑙ｆ瀽鑴氭湰"),
autoFindTaobaoOrder("auto_find_taobao_order", "鏄惁寮�鍚窐瀹濊嚜鍔ㄦ壘鍗�"),
orderListHelp("order_list_help", "璁㈠崟鍒楄〃甯姪閾炬帴"),
+ orderBonusLink("order_bonus_link", "濂栭噾璺宠浆璁㈠崟绛涢�夊垪琛ㄥ府鍔╅摼鎺�"),
lostOrderHelpWhat("lost_order_help_what", "璁㈠崟鎵惧洖-璁㈠崟鎵惧洖鏄粈涔�"),
lostOrderHelpReason("lost_order_help_reason", "璁㈠崟鎵惧洖-鎵惧洖澶辫触鍘熷洜"),
orderFindNotifyUrl("order_find_notify_url", "璁㈠崟鍒楄〃-璁㈠崟鎵惧洖甯姪閾炬帴"),
@@ -162,6 +163,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", "瓒呯骇浼氬憳璇︽儏椤靛府鍔╅摼鎺�"), // 宸插簾寮�
//鏂囨杞摼
@@ -182,8 +184,14 @@
evaluateEmojis("evaluate_emojis", "鍙戝湀璇勮Emojis"),
evaluateText("evaluate_text", "鍙戝湀璇勮鏂囨湰"),
+ orderRebateDescLink("order_rebate_desc_link", "璁㈠崟杩斿埄璁＄畻璇存槑閾炬帴"),
+ orderTeamSubsidyLink("order_team_subsidy_link", "璁㈠崟琛ヨ创甯姪閾炬帴"),
+ orderTeamRewardLink("order_team_reward_link", "璁㈠崟濂栧姳甯姪閾炬帴"),
+ tutorSubsidyLink("tutor_subsidy_link", "瀵煎笀娲ヨ创甯姪閾炬帴"),
- shareOrderRebateDescLink("share_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