From 8fd540a4a03dd32cb66bf1e0fc5fac3e0b214515 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 31 May 2020 22:23:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
index e0f996b..0236da2 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java
@@ -47,7 +47,7 @@
     /**
      * 仓位类型 1-逐仓 2-全仓
      */
-    private int potionType;
+    private int positionType;
 
     /**
      * 交易类型 1-市价 2-限价
@@ -100,6 +100,11 @@
     private Date closingTime;
 
     /**
+     * 平仓类型 2平多3平空4爆仓平多5爆仓平空6止盈平多7止盈平空8止损平多9止损平空
+     */
+    private int closingType;
+
+    /**
      * 杠杆倍率
      */
     private int leverRatio;

--
Gitblit v1.9.1