From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java | 7 +++++++
1 files changed, 7 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 bc09bc3..bf863b3 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", "璁㈠崟鍒楄〃-璁㈠崟鎵惧洖甯姪閾炬帴"),
@@ -178,6 +179,12 @@
shareCommentTextTB("share_comment_text_tb", "娣樺疂鍗曞浘澶氬浘鍒嗕韩鍟嗗搧鏂囨湰"),
shareCommentTextJD("share_comment_text_jd", "浜笢鍗曞浘澶氬浘鍒嗕韩鍟嗗搧鏂囨湰"),
shareCommentTextPDD("share_comment_text_pdd", "鎷煎澶氬崟鍥惧鍥惧垎浜晢鍝佹枃鏈�"),
+
+ evaluateEmojis("evaluate_emojis", "鍙戝湀璇勮Emojis"),
+ evaluateText("evaluate_text", "鍙戝湀璇勮鏂囨湰"),
+
+
+ orderRebateDescLink("order_rebate_desc_link", "璁㈠崟杩斿埄璁＄畻璇存槑閾炬帴"),
;
private final String key;
--
Gitblit v1.8.0