From ad959c3690aea52a0e54e92b001d1959c26c4cc4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB

---
 src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
index e664354..c827265 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -5,7 +5,9 @@
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.web3j.abi.datatypes.Int;
 
 import java.math.BigDecimal;
 
@@ -62,4 +64,51 @@
     private String accountType;
 
     private BigDecimal usdtBalance;
+
+    /**
+     * 激活状态 1-已激活 2-未激活
+     */
+    private Integer activeStatus;
+
+    /**
+     * 滑点分享链
+     */
+    private String feeProfitIds;
+
+    /**
+     * 1-是 2-否
+     */
+    private Integer makerType;
+
+    /**
+     * 出局次数
+     */
+    private Integer outCnt;
+
+    @TableField(exist = false)
+    private BigDecimal totalAmount;
+
+    @TableField(exist = false)
+    private BigDecimal frozenAmount;
+
+    @TableField(exist = false)
+    private BigDecimal availableAmount;
+
+    @ApiModelProperty(value = "直推奖金(直推收益)")
+
+    @TableField(exist = false)
+    private BigDecimal directProfit;
+
+    @ApiModelProperty(value = "平级奖金(层级收益)")
+
+    @TableField(exist = false)
+    private BigDecimal levelProfit;
+
+    @ApiModelProperty(value = "幸运奖金(动能收益)")
+
+    @TableField(exist = false)
+    private BigDecimal luckyProfit;
+
+    @TableField(exist = false)
+    private Long systemProfitId;
 }

--
Gitblit v1.9.1