conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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