From 6b12faed50dda2d32c4dc2e60db59aaa721d7813 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 17:30:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java
index cda5704..13e39bc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java
@@ -2,20 +2,47 @@
 
 import java.util.Date;
 
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 
 /*
  * 鐢ㄦ埛娑堟伅宸茶鐘舵�佸瓨鍌�
  */
+@Table("yeshi_ec_msg_read_state")
 public class UserMsgUnReadNum {
+	@Column(name = "mrs_id")
 	private Long id;
-	private Integer typeOrder;// 璁㈠崟娑堟伅鏈鏁�
-	private Integer typeMoney;// 璧勯噾娑堟伅鏈鏁�
-	private Integer typeAccount;// 璐︽埛娑堟伅鏈鏁�
-	private Integer typeInvite;// 閭�璇锋秷鎭湭璇绘暟
-	private Integer typeScore;// 绉垎娑堟伅鏈鏁�
+	@Column(name = "mrs_uid")
 	private UserInfo user;
+	@Expose
+	@Column(name = "mrs_type_order")
+	private Integer typeOrder;// 璁㈠崟娑堟伅鏈鏁�
+	@Expose
+	@Column(name = "mrs_type_money")
+	private Integer typeMoney;// 璧勯噾娑堟伅鏈鏁�
+	@Expose
+	@Column(name = "mrs_type_account")
+	private Integer typeAccount;// 璐︽埛娑堟伅鏈鏁�
+	@Expose
+	@Column(name = "mrs_type_invite")
+	private Integer typeInvite;// 閭�璇锋秷鎭湭璇绘暟
+	@Expose
+	@Column(name = "mrs_type_score")
+	private Integer typeScore;// 绉垎娑堟伅鏈鏁�
+	@Expose
+	@Column(name = "mrs_type_system")
+	private Integer typeSystem;// 绯荤粺娑堟伅鏈鏁�
+	@Expose
+	@Column(name = "mrs_type_other")
+	private Integer typeOther;// 鍏朵粬娑堟伅
+	@Column(name = "mrs_type_guanxuan_read_time")
+	private Date guanXuanReadTime;// 瀹樺浠诲姟闃呰鏃堕棿
+	@Column(name = "mrs_create_time")
 	private Date createTime;
+	@Column(name = "mrs_update_time")
 	private Date updateTime;
 
 	public Long getId() {
@@ -42,6 +69,14 @@
 		this.typeMoney = typeMoney;
 	}
 
+	public Integer getTypeSystem() {
+		return typeSystem;
+	}
+
+	public void setTypeSystem(Integer typeSystem) {
+		this.typeSystem = typeSystem;
+	}
+
 	public Integer getTypeAccount() {
 		return typeAccount;
 	}
@@ -53,6 +88,8 @@
 	public Integer getTypeInvite() {
 		return typeInvite;
 	}
+
+	
 
 	public void setTypeInvite(Integer typeInvite) {
 		this.typeInvite = typeInvite;
@@ -74,6 +111,14 @@
 		this.user = user;
 	}
 
+	public Integer getTypeOther() {
+		return typeOther;
+	}
+
+	public void setTypeOther(Integer typeOther) {
+		this.typeOther = typeOther;
+	}
+
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -90,4 +135,13 @@
 		this.updateTime = updateTime;
 	}
 
+
+	public Date getGuanXuanReadTime() {
+		return guanXuanReadTime;
+	}
+
+	public void setGuanXuanReadTime(Date guanXuanReadTime) {
+		this.guanXuanReadTime = guanXuanReadTime;
+	}
+
 }

--
Gitblit v1.8.0