From 48934b8c3da5a6791d0805ff0c1d327da834cc2d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java |    7 ++++++-
 1 files changed, 6 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 d8cc6b3..3c776a8 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
@@ -199,6 +199,8 @@
 
 	evaluateEmojis("evaluate_emojis", "鍙戝湀璇勮Emojis"),
 	evaluateText("evaluate_text", "鍙戝湀璇勮鏂囨湰"),
+	evaluateZeroKey("evaluate_zero_key", "0鐐瑰尮閰嶈瘝"),
+
 
 	vipUpgradeLink("vip_upgrade_link", "鎴戠殑鐣岄潰-浼氬憳鍗囩骇閾炬帴"),
 
@@ -223,7 +225,10 @@
 	
 	cloudAlipayJumpLink("cloud_alipay_jump_link","浜戝彂鍗曟敮浠樿烦杞湴鍧�"),
 	cloudAlipayReturnLink("cloud_alipay_return_link","浜戝彂鍗曟敮浠樻垚鍔熷悗杩斿洖鍝釜鍓嶇椤甸潰"),
-	cloudAlipayNotifyLink("cloud_alipay_notify_link","浜戝彂鍗曟敮浠樻垚鍔熷悗鍥炶皟鍦板潃");
+	cloudAlipayNotifyLink("cloud_alipay_notify_link","浜戝彂鍗曟敮浠樻垚鍔熷悗鍥炶皟鍦板潃"),
+	
+	clipboardRecommendGoodsMakeMore("clipboard_recommend_goods_make_more_link","鏍规嵁绮樿创鏉挎帹鑽愬晢鍝佽禋鏇村閾炬帴")
+	;
 	
 	
 	

--
Gitblit v1.8.0