conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

 src/main/java/com/xcong/excoin/modules/blackchain/model/EthUsdtChargeDto.java

@@ -13,6 +13,12 @@
    private String address;
    private String hash;
    private BigDecimal balance;
    private String symbol;

    public interface Symbol{
        String USDT_ERC20 = "USDT_ERC20";
        String USDT_TRC20 = "USDT_TRC20";
    }

    public EthUsdtChargeDto() {
    }