From 7ba7366a8c6ce8019339e433b218386645cb5312 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 17:38:53 +0800
Subject: [PATCH] Merge branch 'piot' of https://gitee.com/chonggaoxiao/new_excoin_manage into piot
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 16 ++++++++++++++--
1 files changed, 14 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 663275f..12a0dc2 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,13 +143,19 @@
/**
* 是否是交易员1是2否
*/
- //private Integer isTrader;
+ @TableField(exist = false)
+ private Integer isTrader;
/**
* 是否设置预估强平价系数 0-否1-是
*/
private Integer isForce;
-
+
+ /**
+ * 是否私募
+ */
+ private Integer ipo;
+
@TableField(exist = false)
private String account;
@@ -172,6 +178,12 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(exist = false)
private Date endTime;
+
+ @TableField(exist = false)
+ private BigDecimal usdtAmount;
+
+ @TableField(exist = false)
+ private BigDecimal rfncAmount;
/**
* 查询条件：账号类型
--
Gitblit v1.9.1