From 93f666908b8b84336aed251a1cc22b49b5c4b12f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:48 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 7 ++++++-
1 files changed, 6 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 1a81f6c..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
@@ -173,4 +173,9 @@
* 强平系数
*/
private BigDecimal forceParam;
+
+ /**
+ * 合约仓位类型
+ */
+ private Integer contractPositionType;
}
--
Gitblit v1.9.1