From 497d9399da3fe78f7ef1934f92953d00df3ac549 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 30 Jul 2020 15:02:55 +0800
Subject: [PATCH] Merge branch 'master' into follow

---
 src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 52166a3..5fb8a33 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
@@ -146,4 +146,14 @@
      * 批次号 队列平仓时使用,避免重复
      */
     public String batchNo;
+
+    /**
+     * 持仓费
+     */
+    private BigDecimal holdAmount;
+
+    /**
+     * 合约类型 1-普通合约 2-跟单合约
+     */
+    private Integer contractType;
 }

--
Gitblit v1.9.1