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/trademanage/vo/MemberAccountInfoVo.java |   24 +++++++++++++++++++-----
 1 files changed, 19 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 05f9783..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;
     /**
      * 手机号(包含国际手机号)
      */
@@ -51,9 +55,19 @@
      * 是否是代理
      */
     private int isSuAccount;
+    private int accountType;
     /**
      * 代理可用金额
      */
     private BigDecimal agentAvailableBalance;
+    
+    /**
+     * 姓名
+     */
+    private String realName; 
+	/**
+	 * 查询条件:账号类型
+	 */
+    private String isTest;
 
 }

--
Gitblit v1.9.1