fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/common/system/service/CommonService.java

@@ -8,4 +8,5 @@

    public boolean verifyCode(String account, String code);

    public String generateOrderNo(Long mid);
}