From 6bfa9de6c86de3b6de5d59e0dc9eebbba13bdb1f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 11:41:01 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new

---
 src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java
index 74e98f3..4c62839 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerSettingEntity.java
@@ -23,11 +23,6 @@
      */
     public static final Integer FOLLOW_TYPE_RATE = 2;
 
-
-    /**
-     * 主键ID
-     */
-    private Long id;
     /**
      * 会员ID
      */
@@ -35,11 +30,11 @@
     /**
      * 交易员ID
      */
-    private Long tradeId;
+    private Long traderId;
     /**
      * 交易员会员ID
      */
-    private Long tradeMemberId;
+    private Long traderMemberId;
     /**
      * 跟单合约(多个,且逗号隔开)
      */

--
Gitblit v1.9.1