From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 6 ++++++
1 files changed, 6 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 c22bc65..ea452fd 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
@@ -75,11 +75,17 @@
public static final int IS_PROFIT_N = 0;
+ public static final Integer IS_TRADER_Y = 1;
+
+ public static final Integer IS_TRADER_N = 2;
+
/**
* 手机号(包含国际手机号)
*/
private String phone;
+ private String name;
+
/**
* 邮箱
*/
--
Gitblit v1.9.1