From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/whole/WholePriceDataModel.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/rabbit/pricequeue/whole/WholePriceDataModel.java b/src/main/java/com/xcong/excoin/rabbit/pricequeue/whole/WholePriceDataModel.java
index 330d4b5..fab88d7 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/whole/WholePriceDataModel.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/whole/WholePriceDataModel.java
@@ -25,7 +25,7 @@
/**
* 当前持仓列表
*/
- private List<ContractHoldOrderEntity> list;
+ private List<HoldOrderDataModel> list;
/**
* 维持保证金
@@ -33,10 +33,12 @@
private BigDecimal holdBond;
/**
- * 权益
+ * 总金额
*/
private BigDecimal balance;
+ private BigDecimal equity;
+
/**
* 爆仓时，各币种价格
*/
--
Gitblit v1.9.1