From 2886d5a6eee762ad7b776e930fc49b01fb64dd5e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 16 六月 2020 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java |    4 +++-
 1 files changed, 3 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 68ce0a8..d497826 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
@@ -212,7 +212,9 @@
 	
 	showSplashAd("show_splash_ad","鏄惁鏄剧ず寮�灞忓箍鍛�"),
 	
-	robotCloudOpen("robot_cloud_open","浜戝彂鍗曢摼鎺�"),
+	testUserArray("test_user_array","娴嬭瘯鐢ㄦ埛鏁扮粍"),
+	
+	robotCloudOpen("robot_cloud_open","浜戝彂鍗曟槸鍚﹀紑鍚�"),
 	robotCloudLink("robot_cloud_link","浜戝彂鍗曢摼鎺�"),
 	cloudAlipayJumpLink("cloud_alipay_jump_link","浜戝彂鍗曟敮浠樿烦杞湴鍧�"),
 	cloudAlipayReturnLink("cloud_alipay_return_link","浜戝彂鍗曟敮浠樻垚鍔熷悗杩斿洖鍝釜鍓嶇椤甸潰"),

--
Gitblit v1.8.0