fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAvivableCoinInfoVo.java

@@ -16,4 +16,7 @@
   @ApiModelProperty(value = "手续费")

   private BigDecimal fee;

   

   @ApiModelProperty(value = "USDT链名")

   private String lable;

	
}