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/netty/bean/ChatRequest.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java b/src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java
new file mode 100644
index 0000000..ef23959
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java
@@ -0,0 +1,31 @@
+package com.xcong.excoin.netty.bean;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * {"data": {"fromMemberId": 443, "isSelf": 1, "memberId": 443, "msg": "w shi shei ", "msgType": 1, "targetId": 444}, "type": 2}
+ */
+@Data
+public class ChatRequest implements Serializable {
+ private static final long serialVersionUID = 3079080008111369136L;
+
+ private Long fromMemberId;
+
+ private Long targetId;
+
+ private Long memberId;
+
+ private Integer msgType;
+
+ private String msg;
+
+ private Integer isSelf;
+
+ private Integer cmd;
+
+ private Long timestamp;
+}
--
Gitblit v1.9.1