From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java |    5 +++++
 1 files changed, 5 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 998ac9b..0f475ea 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
@@ -163,6 +163,11 @@
 	articleHotWords("article_hot_words", "鍔ㄦ��-瀛﹂櫌鏂囩珷鐑悳璇�"),
 	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","鏂版墜鏀荤暐閾炬帴")
 	;
 
 	private final String key;

--
Gitblit v1.8.0