Merge branch 'div'

yujian

2019-06-26 4b561310edc313108ea4991a0c51fe95004009b1

Merge branch 'div'

 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));