Merge remote-tracking branch 'origin/div' into div

yujian

2020-06-03 e74819e845de27735605c8116ee73768560e0fd9

 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;