From ad4774eff562d52b2677cfbcf8e55b8506d57891 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 10:34:26 +0800
Subject: [PATCH] conflict
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 9 +++++++++
1 files changed, 9 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 aaa7e5e..1a81f6c 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
@@ -74,6 +74,15 @@
public static final int IS_PROFIT_Y = 1;
public static final int IS_PROFIT_N = 0;
+
+ public static final Integer IS_TRADER_Y = 1;
+
+ public static final Integer IS_TRADER_N = 2;
+
+ /**
+ * 1是2否
+ */
+ private Integer isTrader;
/**
* 手机号(包含国际手机号)
--
Gitblit v1.9.1