Merge remote-tracking branch 'origin/master'

admin

2019-06-26 e1401a569dc2be36ae54c2df561292f356be21e1

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

@@ -2491,7 +2491,8 @@
            list.addAll(listSpecial);

         }

         

         for (Special special: list) {

         for (int i = 0; i < list.size(); i++) {

            Special special = list.get(i);

            

            JumpDetailV2 jumpDetail = special.getJumpDetail();

            if (jumpDetail != null) {

@@ -2508,7 +2509,8 @@
            // 是否需要弹出框

            if (name.equals("账户等级特权")) { 

               if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                  list.remove(special);

                  list.remove(i);

                  i--;

               } else {

                  if (uid != null) {

                     special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));