Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-14 1b0e20f11a920ba8c0c38e4c8fef58e8fa1fe0d2

 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 = "手续费")