Merge remote-tracking branch 'origin/master'

admin

2019-06-25 a0a5b70e0d0df9357d09542f20dc6633a986f328

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

@@ -111,7 +111,7 @@
      

      // 无新人弹框 则查询默认

      if (floatAD == null) {

         floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, null);

         floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);

      }

      

      if (floatAD != null) {