From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgDeviceReadState.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 4445bc1..2e398ca 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
@@ -27,7 +27,9 @@
 	@Column(name = "mdrs_unread_count")
 	private Integer unReadCount;
 	@Column(name = "mdrs_latest_content")
-	private String latestContent;//鏈�杩戠殑鏈娑堟伅
+	private String latestContent;// 鏈�杩戠殑鏈娑堟伅
+	@Column(name = "mdrs_latest_content_time")
+	private Date latestContentTime;// 鏈�杩戠殑鏈娑堟伅
 	@Column(name = "mdrs_createtime")
 	private Date createTime;
 	@Column(name = "mdrs_update_time")
@@ -96,7 +98,7 @@
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
+
 	public String getLatestContent() {
 		return latestContent;
 	}
@@ -104,4 +106,12 @@
 	public void setLatestContent(String latestContent) {
 		this.latestContent = latestContent;
 	}
+
+	public Date getLatestContentTime() {
+		return latestContentTime;
+	}
+
+	public void setLatestContentTime(Date latestContentTime) {
+		this.latestContentTime = latestContentTime;
+	}
 }

--
Gitblit v1.8.0