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/OtcBlackList.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcBlackList.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcBlackList.java
new file mode 100644
index 0000000..7b30805
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcBlackList.java
@@ -0,0 +1,17 @@
+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_black_list")
+public class OtcBlackList extends BaseEntity {
+
+ private Long memberId;
+
+ private Long blackMemberId;
+
+ private String reasons;
+}
--
Gitblit v1.9.1