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/trademanage/vo/MemberAccountInfoVo.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/vo/MemberAccountInfoVo.java b/src/main/java/com/xcong/excoin/modules/trademanage/vo/MemberAccountInfoVo.java
index efd947b..850bfa7 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/vo/MemberAccountInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/vo/MemberAccountInfoVo.java
@@ -1,15 +1,19 @@
package com.xcong.excoin.modules.trademanage.vo;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.xcong.excoin.common.entity.BaseEntity;
+
import lombok.Data;
@Data
-public class MemberAccountInfoVo {
+public class MemberAccountInfoVo extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
- private Long id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
/**
* 手机号(包含国际手机号)
*/
@@ -44,12 +48,26 @@
*/
private BigDecimal walletFrozenBalance;
/**
+ *总盈亏
+ */
+ private BigDecimal rewardratioByMid;
+ /**
* 是否是代理
*/
private int isSuAccount;
+ private int accountType;
/**
* 代理可用金额
*/
private BigDecimal agentAvailableBalance;
+
+ /**
+ * 姓名
+ */
+ private String realName;
+ /**
+ * 查询条件：账号类型
+ */
+ private String isTest;
}
--
Gitblit v1.9.1