From 00eb9af6bb5f27d717226f3cb7cc231086448cee Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 15:17:42 +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 | 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 1a81f6c..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
@@ -173,4 +173,14 @@
* 强平系数
*/
private BigDecimal forceParam;
+
+ /**
+ * 合约仓位类型
+ */
+ private Integer contractPositionType;
+
+ /**
+ * 指纹解锁功能 1：是 0:否
+ */
+ private Integer fingerprintState;
}
--
Gitblit v1.9.1