Merge branches 'cpv-back' and 'roc-bak' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-11-16 bb34b1893909ac35b9c36c2a87f7127901965d58

 src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java

@@ -135,6 +135,11 @@
     * 预付款金额

     */

    private BigDecimal prePaymentAmount;

    
    /**

     * 持仓费

     */

    private BigDecimal holdAmount;



    /**

     * 预估强平价