From 23f7b250c00597ad89282075460a4c27dffe1ada Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:39:06 +0800
Subject: [PATCH] Merge branch 'dev-msg'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserMsgUnReadNum.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 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..d7eb825 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,42 @@
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;// 绯荤粺娑堟伅鏈鏁�
+ @Column(name = "mrs_create_time")
private Date createTime;
+ @Column(name = "mrs_update_time")
private Date updateTime;
public Long getId() {
@@ -42,6 +64,14 @@
this.typeMoney = typeMoney;
}
+ public Integer getTypeSystem() {
+ return typeSystem;
+ }
+
+ public void setTypeSystem(Integer typeSystem) {
+ this.typeSystem = typeSystem;
+ }
+
public Integer getTypeAccount() {
return typeAccount;
}
--
Gitblit v1.8.0