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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

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

@@ -167,7 +167,7 @@
      for (int i = 0; i < listAD.size(); i++) {

         FloatAD floatAD = listAD.get(i);

         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();

         if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid)) {

         if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid, acceptData.getDevice())) {

            listAD.remove(i);

            i--;

            continue;