From a9fbfbd5dbabcad09cd06e4b07cda8c5a01183ff Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 09 Apr 2021 18:44:53 +0800 Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity --- 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