From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole

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

diff --git a/src/main/java/com/xcong/excoin/modules/documentary/dto/HistoryOrderRecordsDto.java b/src/main/java/com/xcong/excoin/modules/documentary/dto/HistoryOrderRecordsDto.java
index 7ee418c..b3d4f44 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/dto/HistoryOrderRecordsDto.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/dto/HistoryOrderRecordsDto.java
@@ -21,7 +21,7 @@
     private int pageSize;
     
     @NotNull
-    @ApiModelProperty(value = "会员ID", example = "12543")
-    private Long memberId;
+    @ApiModelProperty(value = "交易员ID", example = "12543")
+    private Long tradeId;
 
 }

--
Gitblit v1.9.1