Merge remote-tracking branch 'origin/whole_new' into whole_new

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 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;

    /**
     * 爆仓时，各币种价格
     */