From 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 17:59:09 +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 d497826..d8cc6b3 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
@@ -214,8 +214,13 @@
testUserArray("test_user_array","娴嬭瘯鐢ㄦ埛鏁扮粍"),
- robotCloudOpen("robot_cloud_open","浜戝彂鍗曟槸鍚﹀紑鍚�"),
robotCloudLink("robot_cloud_link","浜戝彂鍗曢摼鎺�"),
+ robotCloudOpen("robot_cloud_open","浜戝彂鍗曟槸鍚﹀紑鍚�-鎴戠殑鐣岄潰"),
+ robotCloudOpenCircle("robot_cloud_open_circle","浜戝彂鍗曟槸鍚﹀紑鍚�-鍙戝湀鐣岄潰"),
+ robotCloudOpenGoodsDetail("robot_cloud_open_goods_detail","浜戝彂鍗曟槸鍚﹀紑鍚�-鍟嗗搧璇︽儏"),
+ robotCloudGroupPictureNum("robot_cloud_group_picture_num","浜戝彂鍗曠兢鍥剧墖鏁伴噺"),
+
+
cloudAlipayJumpLink("cloud_alipay_jump_link","浜戝彂鍗曟敮浠樿烦杞湴鍧�"),
cloudAlipayReturnLink("cloud_alipay_return_link","浜戝彂鍗曟敮浠樻垚鍔熷悗杩斿洖鍝釜鍓嶇椤甸潰"),
cloudAlipayNotifyLink("cloud_alipay_notify_link","浜戝彂鍗曟敮浠樻垚鍔熷悗鍥炶皟鍦板潃");
--
Gitblit v1.8.0