From 3db83ef4add286feabba2d5db4eabfa27d5fc5f1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 17:13:24 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

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

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerOrderRelationEntity.java b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerOrderRelationEntity.java
index 73a58f4..fa79159 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerOrderRelationEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/entity/FollowFollowerOrderRelationEntity.java
@@ -38,7 +38,7 @@
     /**
      * 跟单订单ID
      */
-    private Long tradeOrderId;
+    private String tradeOrderNo;
 
     /**
      * 交易员用户ID

--
Gitblit v1.9.1