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

admin

2020-03-13 3a186e11c331be324f7f470ecf67515ce1d52133

 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java

@@ -1093,7 +1093,7 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("被邀请人", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();

         contentList.add(new ClientTextStyleVO("邀请队员成功", COLOR_CONTENT));

         contentList.add(new ClientTextStyleVO("邀请粉丝成功", COLOR_CONTENT));

         items.add(new CommonMsgItemVO(new ClientTextStyleVO("邀请状态", COLOR_TITLE), contentList));



         contentList = new ArrayList<>();