From 829d77f7145514d67d957ad54dbef854440f77d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 31 Jul 2020 17:05:08 +0800
Subject: [PATCH] fix conflect
---
src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java
index 65fc9ba..87aec59 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java
@@ -19,6 +19,9 @@
*
*/
private static final long serialVersionUID = 1L;
+
+ public static final String AVATAR_DEFAULT = "测试图片地址";
+ public static final String DECLARATION_DEFAULT = "正忙着赚钱，什么也没写";
/**
* 会员ID
*/
@@ -50,8 +53,8 @@
*/
private Integer verifyStatus;
public static final Integer VERIFYSTATUS_Y = 1;
- public static final Integer VERIFYSTATUS_ING = 2;
- public static final Integer VERIFYSTATUS_N = 3;
+ public static final Integer VERIFYSTATUS_N = 2;
+ public static final Integer VERIFYSTATUS_ING = 3;
/**
* 是否开启带单 1是2否
*/
--
Gitblit v1.9.1