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

yujian

2020-04-24 33a603f2c8abe311fae3c84b0e54067580cc088c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java

@@ -400,6 +400,11 @@
               }

            }

            data.put("vip", inner);

            //平台规则

            String platformRuleLink = configService.get(ConfigKeyEnum.platformRule.getKey());

            data.put("platformRule", platformRuleLink);

				
				
         }


         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) && uid != null) {