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/vo/MyFollowOrderVo.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/MyFollowOrderVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/MyFollowOrderVo.java
index 782a43a..7a36b08 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/MyFollowOrderVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/MyFollowOrderVo.java
@@ -31,14 +31,17 @@
@ApiModelProperty("盈亏金额")
private BigDecimal rewardAmount;
- @ApiModelProperty("张数")
+ @ApiModelProperty("盈亏比例")
private BigDecimal rewardRatio;
- @ApiModelProperty("盈亏比例")
+ @ApiModelProperty("张数")
private int symbolCnt;
@ApiModelProperty("保证金")
private BigDecimal bondAmount;
+
+ @ApiModelProperty("当前价")
+ private BigDecimal newPrice;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("开仓时间")
@@ -51,4 +54,7 @@
@ApiModelProperty("订单编号")
private String orderNo;
+ @ApiModelProperty("交易员")
+ private String nickname;
+
}
--
Gitblit v1.9.1