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/OrderWalletCoinDealVo.java

@@ -63,6 +63,12 @@
   @ApiModelProperty(value = "成交金额")

   private BigDecimal dealAmount;

   /**

    * 状态  2：撤单3：已成交

    */

   @ApiModelProperty(value = "状态  2：撤单3：已成交")

   private Integer orderStatus;

	
   /**

    * 手续费

    */

   @ApiModelProperty(value = "手续费")