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

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

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

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

         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();

         if (typeEnum == FloatADTypeEnum.newUserRedPack

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

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

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



            listAD.remove(i);

            i--;

            continue;