fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java

@@ -86,5 +86,7 @@


   public Result getMemberAccountInfo(String account,int type);



   public Result getAppVersionInfo();





}