From 8de9b17d1070f3e0cd2094e0385035fe0c1ef535 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 Aug 2020 18:20:00 +0800
Subject: [PATCH] Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

---
 src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
index c39e3d1..1a98eb1 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
@@ -58,7 +58,7 @@
     /**
      * 仓位类型 1-逐仓 2-全仓
      */
-    private int potionType;
+    private int positionType;
 
     /**
      * 交易类型 1-市价 2-限价
@@ -146,4 +146,19 @@
      * 批次号 队列平仓时使用,避免重复
      */
     public String batchNo;
+
+    /**
+     * 持仓费
+     */
+    private BigDecimal holdAmount;
+
+    /**
+     * 合约类型 1-普通合约 2-跟单合约
+     */
+    private Integer contractType;
+
+    /**
+     * 已实现盈亏
+     */
+    private BigDecimal rewardAmount;
 }

--
Gitblit v1.9.1