From 616b119c283147deef21fbc519291221ba4897b1 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期二, 18 二月 2020 11:30:03 +0800
Subject: [PATCH] Merge branch 'div' of ssh://yujian@193.112.35.168:29418/fanli-server.git into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java |    3 ++-
 1 files changed, 2 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 73a9fb1..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
@@ -166,7 +166,8 @@
 	//鏂囨杞摼
 	convertDocWebLink("convert_doc_web_link","鏂囨杞摼缃戦〉"),
 	convertDocHelpLink("convert_doc_help_link","鏂囨杞摼甯姪缃戦〉"),
-	convertDocTip("convert_doc_tip","鏂囨杞摼娓╅Θ鎻愮ず")
+	convertDocTip("convert_doc_tip","鏂囨杞摼娓╅Θ鎻愮ず"),
+	newerGonglue("newer_gonglue_url","鏂版墜鏀荤暐閾炬帴")
 	;
 
 	private final String key;

--
Gitblit v1.8.0