From 6b9b8b50fbefd21479197ccfa9abfe039e04f1d6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Sep 2020 16:23:07 +0800
Subject: [PATCH] Merge branch 'master' into whole_new
---
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 9a82765..a59fe55 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
*/
--
Gitblit v1.9.1