From 33a603f2c8abe311fae3c84b0e54067580cc088c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 24 四月 2020 16:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 36d47a1..95f2fb2 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
@@ -20,7 +20,8 @@
shareRuleLinkJD("share_rule_link_jd", "浜笢鍒嗕韩瑙勫垯锛堝府鍔╀腑蹇冿級"),
shareRuleLinkPDD("share_rule_link_pdd", "鎷煎澶氬垎浜鍒欙紙甯姪涓績锛�"),
shareSingleGoodsRule("share_single_goods_rule", "鍗曞搧鍒嗕韩瑙勫垯"),
- shareGoodsTemplateRules("share_goods_template_rules", "鍒嗕韩妯℃澘瑙勫垯"), // 瀛樺湪2涓浉鍚� 鍐呭涓嶅悓銆佺増鏈絾涓�鏍�
+ shareGoodsTemplateRules("share_goods_template_rules", "鍒嗕韩妯℃澘瑙勫垯"), // 瀛樺湪2涓浉鍚�
+ // 鍐呭涓嶅悓銆佺増鏈絾涓�鏍�
shareGoodsTemplateRulesJD("share_goods_template_rules_jd", "浜笢妯℃澘瑙勫垯"),
shareGoodsTemplateRulesPDD("share_goods_template_rules_pdd", "鎷煎澶氭ā鏉胯鍒�"),
goodsShareNotifyImgs("goods_share_notify_imgs", "鍗曚釜鍟嗗搧鍒嗕韩鐨勫埜鎻愮ず鍥剧墖"),
@@ -82,7 +83,8 @@
taobaoProxyIP("taobao_proxy_ip", "娣樺疂鍟嗗搧璇︽儏浠ｇ悊IP"),
taobaoCartJS("taobao_cart_js", "娣樺疂璐墿杞﹁剼鏈�"),
taobaoCartLink("taobao_cart_link", "璐墿杞﹂摼鎺�"),
- taobaoCartJumpDetail("taobao_cart_jump_detail", "鎴戠殑璐墿杞﹁烦杞柟寮�"), // 瀛樺湪2涓浉鍚� 瀛樺湪鐗堟湰鍖哄垎
+ taobaoCartJumpDetail("taobao_cart_jump_detail", "鎴戠殑璐墿杞﹁烦杞柟寮�"), // 瀛樺湪2涓浉鍚�
+ // 瀛樺湪鐗堟湰鍖哄垎
taobaoCouponHelp("taobao_coupon_help", "鍒稿府鍔�"),
convertTaoBaoLinkInServer("convert_taobao_link_in_server", "鏄惁鍦ㄦ湇鍔＄杞摼"),
showTaobaoCartConvert("show_taobao_cart_convert", "璐墿杞︽槸鍚﹁浆閾�"),
@@ -165,32 +167,33 @@
inviteRules("invite_rules", "鍔ㄦ��-瀛﹂櫌鏂囩珷鐑悳璇�"),
vipLink("vip_link", "瓒呯骇浼氬憳鍗囩骇閾炬帴"), // 杞Щ鑷砎IPConfig 宸插簾寮�
helpLinkVipInfo("help_link_vip_info", "瓒呯骇浼氬憳璇︽儏椤靛府鍔╅摼鎺�"), // 宸插簾寮�
- //鏂囨杞摼
- convertDocWebLink("convert_doc_web_link","鏂囨杞摼缃戦〉"),
- convertDocHelpLink("convert_doc_help_link","鏂囨杞摼甯姪缃戦〉"),
- convertDocTip("convert_doc_tip","鏂囨杞摼娓╅Θ鎻愮ず"),
- newerGonglue("newer_gonglue_url","鏂版墜鏀荤暐閾炬帴"),
- tearcherLink("tearcher_link","瀵煎笀閾炬帴"),
+ // 鏂囨杞摼
+ convertDocWebLink("convert_doc_web_link", "鏂囨杞摼缃戦〉"),
+ convertDocHelpLink("convert_doc_help_link", "鏂囨杞摼甯姪缃戦〉"),
+ convertDocTip("convert_doc_tip", "鏂囨杞摼娓╅Θ鎻愮ず"),
+ newerGonglue("newer_gonglue_url", "鏂版墜鏀荤暐閾炬帴"),
+ tearcherLink("tearcher_link", "瀵煎笀閾炬帴"),
quickShareGoodsText("quick_share_goods_text", "蹇嵎鍒嗕韩鍟嗗搧鏂囨湰"),
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", "鍥㈤槦濂栧姳缁熻椤甸潰闂彿"),
- ;
+
+ // 骞冲彴瑙勫垯
+ platformRule("platform_rule_link", "骞冲彴瑙勫垯");
private final String key;
private final String desc;
--
Gitblit v1.8.0