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

zainali5120

2020-10-12 335ec6398bb70d60a765b4782376e8141cbfa9cf

 src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java

@@ -48,6 +48,12 @@
    */

   @ApiModelProperty(value = "委托价")

   private BigDecimal entrustPrice;



   /**

    * 委托价

    */

   @ApiModelProperty(value = "委托价")

   private BigDecimal entrustAmount;

   /**

    * 成交量

    */