Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

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

@@ -519,7 +519,7 @@
         items.add(new CommonMsgItemVO(new ClientTextStyleVO("备注", COLOR_TITLE), contentList));

      }



      return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png", msg.getType().getDesc(),

      return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png", msg.getType().getDesc(),

            msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);

   }