Merge remote-tracking branch 'origin/master'

admin

2019-07-18 2a671d23fa0e5c979a8b6459b4914481cd10c353

Merge remote-tracking branch 'origin/master'

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

@@ -699,11 +699,11 @@
                        acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);

                boolean read = false;

                if (state != null && state.getReadTime() != null

                        && list.get(0).getCreateTime().getTime() < state.getReadTime().getTime())

                        && list.get(0).getPushTime().getTime() < state.getReadTime().getTime())

                    read = true;



                commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "推荐记录",

                        list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), read,

                        list.get(0).getPushTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), read,

                        jumpDetailV2Service.getByTypeCache("recommend_list"), null, 0));

            }

        }