From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 17 ++++++++++++++++-
1 files changed, 16 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..6f4797f 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,19 @@
* 平仓点数
*/
private BigDecimal closingSpread;
+
+ /**
+ * 强平系数
+ */
+ private BigDecimal forceParam;
+
+ /**
+ * 合约仓位类型
+ */
+ private Integer contractPositionType;
+
+ /**
+ * 指纹解锁功能 1：是 0:否
+ */
+ private Integer fingerprintState;
}
--
Gitblit v1.9.1