From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +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, 10 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..b5afe5d 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
@@ -174,6 +174,16 @@
 	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", "鍙戝湀璇勮鏂囨湰"),
+	
+	
+	shareOrderRebateDescLink("share_order_rebate_desc_link", "鍒嗕韩璁㈠崟杩斿埄璁$畻璇存槑閾炬帴"),
 	;
 
 	private final String key;

--
Gitblit v1.8.0