From f91a65805c27c2bb01eb94f1ec9c2afa07a44020 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 11 Aug 2020 11:29:20 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 4b40c14..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
@@ -58,7 +58,7 @@
/**
* 仓位类型 1-逐仓 2-全仓
*/
- private int potionType;
+ private int positionType;
/**
* 交易类型 1-市价 2-限价
@@ -83,7 +83,7 @@
/**
* 币种规格
*/
- private Long symbolSku;
+ private BigDecimal symbolSku;
/**
* 开仓价
@@ -103,7 +103,7 @@
/**
* 保证金
*/
- private BigDecimal bondPrice;
+ private BigDecimal bondAmount;
/**
* 杠杆倍率
@@ -146,4 +146,14 @@
* 批次号 队列平仓时使用，避免重复
*/
public String batchNo;
+
+ /**
+ * 持仓费
+ */
+ private BigDecimal holdAmount;
+
+ /**
+ * 合约类型 1-普通合约 2-跟单合约
+ */
+ private Integer contractType;
}
--
Gitblit v1.9.1