From 8dd45c1c726b5628dfd8cae1992a27112ebb6af6 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 16 Mar 2022 15:23:38 +0800 Subject: [PATCH] Merge branch 'bea-back' of http://120.27.238.55:7000/r/exchange-back into bea-back --- src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 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..06cae7a 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 @@ -71,6 +71,12 @@ public static final int IS_PROFIT_N = 0; /** + * 是否是商户1是2否 + */ + public static final int ISTRADER_Y = 1; + public static final int ISTRADER_N = 2; + + /** * 手机号(包含国际手机号) */ private String phone; @@ -139,13 +145,25 @@ * 是否设置盈亏难度系数 0-否1-是 */ private Integer isProfit; + + /** + * 是否是交易员1是2否 + */ + 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 +183,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