Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-01 eed54c262df12dd3d132bf14691915e6183afd4c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java

@@ -179,7 +179,7 @@
         FloatAD floatAD = listAD.get(i);

         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();

         if (typeEnum == FloatADTypeEnum.newUserRedPack

               && (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())

               && (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())

                     || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {



            listAD.remove(i);