fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

@@ -11,7 +11,7 @@
 * @author xy

 */

@Data

@ApiModel(value = "币币账户信息返回", description = "币币账户信息返回")

@ApiModel(value = "MemberWalletCoinVo", description = "币币账户信息返回")

public class MemberWalletCoinVo {

   

   private static final long serialVersionUID = 1L;