From e74819e845de27735605c8116ee73768560e0fd9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 03 六月 2020 15:17:15 +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 4f0ff6e..4ee05de 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,7 +199,12 @@
 	activityDetailLink("activity_detail_link", "娲诲姩璇︽儏杩囨浮椤�"),
 	
 	// 骞冲彴瑙勫垯
-	platformRule("platform_rule_link", "骞冲彴瑙勫垯");
+	platformRule("platform_rule_link", "骞冲彴瑙勫垯"),
+	
+	showSplashAd("show_splash_ad","鏄惁鏄剧ず寮�灞忓箍鍛�"),
+	
+	robotCloudLink("robot_cloud_link","浜戝彂鍗曢摼鎺�");
+	
 
 	private final String key;
 	private final String desc;

--
Gitblit v1.8.0