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 | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 5e3ea1c..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
@@ -139,13 +139,26 @@
* 是否设置盈亏难度系数 0-否1-是
*/
private Integer isProfit;
+
+ /**
+ * 是否是交易员1是2否
+ */
+ @TableField(exist = false)
+ private Integer isTrader;
/**
* 是否设置预估强平价系数 0-否1-是
*/
private Integer isForce;
+
+ /**
+ * 是否私募
+ */
+ private Integer ipo;
+
@TableField(exist = false)
private String account;
+
@TableField(exist = false)
private String firstName;
@@ -165,4 +178,14 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(exist = false)
private Date endTime;
+
+ /**
+ * 查询条件：账号类型
+ */
+ @TableField(exist = false)
+ private String isTest;
+ @TableField(exist = false)
+ private String usdtBalance;
+ @TableField(exist = false)
+ private String rocBalance;
}
--
Gitblit v1.9.1