From 1afe0ef75b6741a322cd8057870585a3c03d4da3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 Aug 2020 19:15:20 +0800
Subject: [PATCH] Merge branch 'master' into whole
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index 31126d9..e73a151 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -117,7 +117,7 @@
/**
* 账号状态 0-禁用 1-启用
*/
- private int accountStatus;
+ private Integer accountStatus;
/**
* 上级推荐人id
@@ -168,4 +168,14 @@
* 平仓点数
*/
private BigDecimal closingSpread;
+
+ /**
+ * 强平系数
+ */
+ private BigDecimal forceParam;
+
+ /**
+ * 合约仓位类型
+ */
+ private Integer contractPositionType;
}
--
Gitblit v1.9.1