From 05c74ca131add20dbcf23dc109e63c21b3e2be29 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Feb 2021 18:11:57 +0800
Subject: [PATCH] Merge branch 'whole_new_trc20' into whole_new
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 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 ebbd0e5..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
@@ -46,6 +46,15 @@
public static final Integer ACCOUNT_TYPE_EMAIL = 2;
/**
+ * 正常账号
+ */
+ public static final Integer ACCOUNT_TYPE_NORMAL = 1;
+ /**
+ * 测试账号
+ */
+ public static final Integer ACCOUNT_TYPE_TEST = 2;
+
+ /**
* 实名认证 审核通过
*/
public static final Integer CERTIFY_STATUS_Y = 2;
@@ -65,6 +74,15 @@
public static final int IS_PROFIT_Y = 1;
public static final int IS_PROFIT_N = 0;
+
+ public static final Integer IS_TRADER_Y = 1;
+
+ public static final Integer IS_TRADER_N = 2;
+
+ /**
+ * 1是2否
+ */
+ private Integer isTrader;
/**
* 手机号(包含国际手机号)
@@ -99,7 +117,7 @@
/**
* 账号状态 0-禁用 1-启用
*/
- private int accountStatus;
+ private Integer accountStatus;
/**
* 上级推荐人id
@@ -145,4 +163,19 @@
* 滑点
*/
private BigDecimal spread;
+
+ /**
+ * 平仓点数
+ */
+ private BigDecimal closingSpread;
+
+ /**
+ * 强平系数
+ */
+ private BigDecimal forceParam;
+
+ /**
+ * 合约仓位类型
+ */
+ private Integer contractPositionType;
}
--
Gitblit v1.9.1