From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java
index 3f8dfd2..0e52995 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserCommonMsgVO.java
@@ -9,6 +9,7 @@
public static String TYPE_GUANXUAN = "guanxuan";
public static String TYPE_ZHUSHOU = "zhushou";
public static String TYPE_RECOMMEND = "recommend";
+ public static String TYPE_SYSTEM = "system";// 绯荤粺娑堟伅
private String icon;
private String title;
@@ -18,9 +19,10 @@
private Boolean read;// 鏄惁宸茶
private JumpDetailV2 jumpDetail;// 璺宠浆璇︽儏
private String params;// 璺宠浆鍙傛暟
+ private Integer unReadCount;// 娑堟伅鏈鏁�
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 +31,15 @@
this.read = read;
this.jumpDetail = jumpDetail;
this.params = params;
+ this.unReadCount = unReadCount;
+ }
+
+ public Integer getUnReadCount() {
+ return unReadCount;
+ }
+
+ public void setUnReadCount(Integer unReadCount) {
+ this.unReadCount = unReadCount;
}
public UserCommonMsgVO() {
--
Gitblit v1.8.0