From c576b9f8f6a49a1efb27e5e7d1e09fc5f2336796 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Dec 2020 17:58:44 +0800
Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin.git into outcenter

---
 src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 aaa7e5e..1609e0b 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
@@ -94,6 +94,10 @@
      * 交易密码
      */
     private String tradePassword;
+    /**
+     * 钱包地址
+     */
+    private String address;
 
     /**
      * 交易密码时效性设置
@@ -149,7 +153,12 @@
      * 是否设置预估强平价系数 0-否1-是
      */
     private Integer isForce;
-    
+
+    /**
+     *  shifou xianzhi
+     */
+    private Integer isTrader;
+
     /**
      * 滑点
      */

--
Gitblit v1.9.1