From 0c92259e4df497acede01817298c527c9d2ba347 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 01 Dec 2020 14:35:53 +0800
Subject: [PATCH] Merge branch 'outcenter-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage.git into outcenter-bak
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 174bd4d..e68b96f 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
@@ -143,14 +143,19 @@
/**
* 是否是交易员1是2否
*/
- //@TableField(exist = false)
+ @TableField(exist = false)
private Integer isTrader;
/**
* 是否设置预估强平价系数 0-否1-是
*/
private Integer isForce;
-
+
+ /**
+ * 是否私募
+ */
+ private Integer ipo;
+
@TableField(exist = false)
private String account;
@@ -179,4 +184,8 @@
*/
@TableField(exist = false)
private String isTest;
+ @TableField(exist = false)
+ private String usdtBalance;
+ @TableField(exist = false)
+ private String rocBalance;
}
--
Gitblit v1.9.1