From a525f3faae1d749ccceefeb10612ab59cf4d9c1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 三月 2019 13:17:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java
index 95a30df..f3975d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/UserSystemMsg.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;
import com.yeshi.fanli.entity.system.SystemZnx;
@@ -16,27 +17,38 @@
*/
@Table("yeshi_ec_msg_system")
public class UserSystemMsg {
- @Column(name="ms_id")
+ public final static int TIME_TAG_COMMON = 0;// 鏅��
+ public final static int TIME_TAG_EMERGENT = 1;// 绱ф��
+
+ @Expose
+ @Column(name = "ms_id")
private Long id;
- @Column(name="ms_uid")
+ @Column(name = "ms_uid")
private UserInfo user;
- @Column(name="ms_type")
+ @Expose
+ @Column(name = "ms_type")
private UserSystemMsgTypeEnum type;// 娑堟伅绫诲瀷
- @Column(name="ms_system_znx_id")
+ @Column(name = "ms_system_znx_id")
private SystemZnx systemZNX;// 绯荤粺缁熶竴骞挎挱鐨勭珯鍐呬俊锛屽綋鏈夌郴缁熺珯鍐呬俊鏃讹紝鏍囬鍐呭绛変负绌�
- @Column(name="ms_read")
+ @Column(name = "ms_read")
+ @Expose
private Boolean read;// 鏄惁宸茶
- @Column(name="ms_solved")
+ @Expose
+ @Column(name = "ms_solved")
private Boolean solved;// 鏄惁宸茬粡瑙ｅ喅
- @Column(name="ms_title")
+ @Column(name = "ms_title")
+ @Expose
private String title;// 鏍囬
- @Column(name="ms_content")
+ @Column(name = "ms_content")
+ @Expose
private String content;// 鍐呭
- @Column(name="ms_time_tag")
+ @Column(name = "ms_time_tag")
+ @Expose
private Integer timeTag;// 鏃堕棿鏍囪瘑锛�1-绱ф�� 0-鏅��
- @Column(name="ms_create_time")
+ @Expose
+ @Column(name = "ms_create_time")
private Date createTime;
- @Column(name="ms_update_time")
+ @Column(name = "ms_update_time")
private Date updateTime;
public Long getId() {
--
Gitblit v1.8.0