From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/modules/otc/entity/OtcMsgHistoryEntity.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMsgHistoryEntity.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMsgHistoryEntity.java
new file mode 100644
index 0000000..daa3662
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMsgHistoryEntity.java
@@ -0,0 +1,30 @@
+package com.xcong.excoin.modules.otc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+//历史消息
+@Data
+@TableName("otc_msg_history")
+public class OtcMsgHistoryEntity extends BaseEntity {
+
+ //用户ID
+ private long memberId;
+
+ //发送方
+ private long fromMemberId;
+ //对方用户ID
+ private long targetId;
+
+ //消息
+ private String msg;
+
+ //消息类型 1-文本2-图片
+ private Integer msgType;
+
+ //是不是memberId发的消息 1：是 2：否
+ private Integer isSelf;
+ public static final Integer ISSELF_ONE = 1;
+ public static final Integer ISSELF_TWO = 2;
+}
--
Gitblit v1.9.1