From a00d810984fe187d24e442d5f557bcc271cfa3ce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 Jan 2021 11:25:49 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java | 12 +++++++++++-
1 files changed, 11 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 9a82765..fd6ae5b 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
@@ -60,7 +60,12 @@
*/
public static final int ORDER_TYPE_CLOSE_LESS = 4;
-
+ /**
+ * 订单类型1普通合约2跟单合约
+ */
+ private int contractType;
+ public static final int CONTRACTTYPE_NORMAL = 1;
+ public static final int CONTRACTTYPE_DOCUMENTARY = 2;
/**
* 会员Id
*/
@@ -200,4 +205,9 @@
private int operateNo;
+ /**
+ * 维持保证金
+ */
+ private BigDecimal holdBond;
+
}
--
Gitblit v1.9.1