From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java
index 13c7260..8fbac7d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java
@@ -2,6 +2,9 @@
import java.util.Date;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -11,12 +14,13 @@
* @author Administrator
*
*/
+@Table("yeshi_ec_msg_invite")
public class MsgInviteDetail {
- public enum MsgTypeInviteEnumType {
+ public enum MsgTypeInviteTypeEnum {
invite("閭�璇锋秷鎭�");
private final String desc;
- private MsgTypeInviteEnumType(String desc) {
+ private MsgTypeInviteTypeEnum(String desc) {
this.desc = desc;
}
@@ -25,14 +29,23 @@
}
}
+ @Column(name="mi_id")
private Long id;
+ @Column(name="mi_uid")
private UserInfo user;
- private MsgTypeInviteEnumType msgType;// 娑堟伅绫诲瀷
+ @Column(name="mi_type")
+ private MsgTypeInviteTypeEnum msgType;// 娑堟伅绫诲瀷
+ @Column(name="mi_invite_id")
private ThreeSale inviteUser;// 閭�璇蜂俊鎭�
+ @Column(name="mi_desc")
private String desc;// 璇存槑
+ @Column(name="mi_beizhu")
private String beiZhu;// 澶囨敞
+ @Column(name="mi_read")
private Boolean read;// 鏄惁宸茶
+ @Column(name="mi_create_time")
private Date createTime;
+ @Column(name="mi_update_time")
private Date updateTime;
public Long getId() {
@@ -51,11 +64,11 @@
this.user = user;
}
- public MsgTypeInviteEnumType getMsgType() {
+ public MsgTypeInviteTypeEnum getMsgType() {
return msgType;
}
- public void setMsgType(MsgTypeInviteEnumType msgType) {
+ public void setMsgType(MsgTypeInviteTypeEnum msgType) {
this.msgType = msgType;
}
--
Gitblit v1.8.0