Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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;

   }

}