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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java

@@ -9,6 +9,8 @@
   public static String TYPE_GUANXUAN = "guanxuan";

   public static String TYPE_ZHUSHOU = "zhushou";

   public static String TYPE_RECOMMEND = "recommend";

   public static String TYPE_SYSTEM = "system";// 系统消息

   public static String TYPE_NOTIFY = "notify";// 通知消息



   private String icon;

   private String title;

@@ -18,9 +20,11 @@
   private Boolean read;// 是否已读

   private JumpDetailV2 jumpDetail;// 跳转详情

   private String params;// 跳转参数

   private Integer unReadCount;// 消息未读数

   private String picture;// 大图



   public UserCommonMsgVO(String icon, String title, Date time, String type, String latestMsg, Boolean read,

         JumpDetailV2 jumpDetail, String params) {

         JumpDetailV2 jumpDetail, String params, Integer unReadCount) {

      this.icon = icon;

      this.title = title;

      this.time = time;

@@ -29,6 +33,23 @@
      this.read = read;

      this.jumpDetail = jumpDetail;

      this.params = params;

      this.unReadCount = unReadCount;

   }



   public String getPicture() {

      return picture;

   }



   public void setPicture(String picture) {

      this.picture = picture;

   }



   public Integer getUnReadCount() {

      return unReadCount;

   }



   public void setUnReadCount(Integer unReadCount) {

      this.unReadCount = unReadCount;

   }



   public UserCommonMsgVO() {