From ad4774eff562d52b2677cfbcf8e55b8506d57891 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 06 Aug 2020 10:34:26 +0800
Subject: [PATCH] conflict

---
 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
index 4f945e9..916b773 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -84,5 +84,9 @@
 
 	public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto);
 
+	public Result getMemberAccountInfo(String account,int type);
+
+	public Result getAppVersionInfo();
+
 
 }

--
Gitblit v1.9.1