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/OtcOrderAppeal.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java
new file mode 100644
index 0000000..5ce16d1
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java
@@ -0,0 +1,31 @@
+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_order_appeal")
+public class OtcOrderAppeal extends BaseEntity {
+
+    private Long memberId;
+
+    private Long orderId;
+
+    /**
+     * 申诉原因
+     */
+    private String reason;
+
+    /**
+     * 申诉内容
+     */
+    private String content;
+
+    //申诉状态  1:待处理 2:处理中 3:已处理
+    private Integer status;
+    public static final Integer STATUS_ONE = 1;
+    public static final Integer STATUS_TWO = 2;
+    public static final Integer STATUS_THREE = 3;
+}

--
Gitblit v1.9.1