Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-13 17fb78903b310564aaeea6e4fd50824f45d4677a

 src/main/java/com/xcong/excoin/modules/coin/entity/OrderCoinsEntity.java

@@ -57,6 +57,11 @@
    * 成交价

    */

   private BigDecimal dealPrice;



   /**

    *  市价委托时的委托金额

    */

   private BigDecimal entrustAmount;

   /**

    * 成交金额

    */