From aba5dee7a341ecb60fe02f088684aa982ac037f9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 11 六月 2019 09:10:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgDeviceReadState.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgDeviceReadState.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgDeviceReadState.java
index da29fe9..4445bc1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgDeviceReadState.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgDeviceReadState.java
@@ -12,6 +12,7 @@
 public class MsgDeviceReadState {
 	public static String TYPE_ZHUSHOU = "zhushou";// 杩斿埄鍒稿皬鍔╂墜
 	public static String TYPE_RECOMMEND = "recommend";// 鎺ㄨ崘
+	public static String TYPE_KEFU = "kefu";
 
 	@Column(name = "mdrs_id")
 	private Long id;
@@ -25,6 +26,8 @@
 	private Date readTime;
 	@Column(name = "mdrs_unread_count")
 	private Integer unReadCount;
+	@Column(name = "mdrs_latest_content")
+	private String latestContent;//鏈�杩戠殑鏈娑堟伅
 	@Column(name = "mdrs_createtime")
 	private Date createTime;
 	@Column(name = "mdrs_update_time")
@@ -93,4 +96,12 @@
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
+	
+	public String getLatestContent() {
+		return latestContent;
+	}
+
+	public void setLatestContent(String latestContent) {
+		this.latestContent = latestContent;
+	}
 }

--
Gitblit v1.8.0