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/OtcReturnMoney.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcReturnMoney.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcReturnMoney.java
new file mode 100644
index 0000000..0bda18b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcReturnMoney.java
@@ -0,0 +1,22 @@
+package com.xcong.excoin.modules.otc.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("otc_return_money")
+public class OtcReturnMoney extends BaseEntity {
+
+ private String orderNo;
+
+ private Long toMemberId;
+
+ private Long fromMemberId;
+
+ private BigDecimal amount;
+
+}
--
Gitblit v1.9.1