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/UserMsgUnReadNum.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 08fe949..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
@@ -5,6 +5,7 @@
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;
/*
@@ -16,18 +17,29 @@
private Long id;
@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")
@@ -77,6 +89,8 @@
return typeInvite;
}
+
+
public void setTypeInvite(Integer typeInvite) {
this.typeInvite = typeInvite;
}
@@ -97,6 +111,14 @@
this.user = user;
}
+ public Integer getTypeOther() {
+ return typeOther;
+ }
+
+ public void setTypeOther(Integer typeOther) {
+ this.typeOther = typeOther;
+ }
+
public Date getCreateTime() {
return createTime;
}
@@ -113,4 +135,13 @@
this.updateTime = updateTime;
}
+
+ public Date getGuanXuanReadTime() {
+ return guanXuanReadTime;
+ }
+
+ public void setGuanXuanReadTime(Date guanXuanReadTime) {
+ this.guanXuanReadTime = guanXuanReadTime;
+ }
+
}
--
Gitblit v1.8.0