From 0730d0e9b5714394241cb3a19f3be38a40c46f7c Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 11 Nov 2020 16:40:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/roc-bak' into roc-bak
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 11 ++++++++++-
1 files changed, 10 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 e3c9d5f..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
@@ -150,7 +150,12 @@
* 是否设置预估强平价系数 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