From c5d6c4c5e7651330ab97d2ac445c3d27159ce264 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 29 Jul 2020 17:31:22 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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..1a81f6c 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;
/**
* 手机号(包含国际手机号)
@@ -145,4 +163,14 @@
* 滑点
*/
private BigDecimal spread;
+
+ /**
+ * 平仓点数
+ */
+ private BigDecimal closingSpread;
+
+ /**
+ * 强平系数
+ */
+ private BigDecimal forceParam;
}
--
Gitblit v1.9.1