From 8d3af50dc891df38e694178613503fb589ede6af Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 30 Nov 2020 11:27:44 +0800
Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin.git into outcenter
---
src/main/java/com/xcong/excoin/common/system/controller/LoginController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
index 7694638..27bcd67 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
@@ -17,10 +17,10 @@
import com.xcong.excoin.common.system.dto.LoginDto;
import com.xcong.excoin.common.system.dto.OutCenterRegisterDto;
import com.xcong.excoin.common.system.dto.RegisterDto;
-import com.xcong.excoin.common.system.entity.WtWallet;
-import com.xcong.excoin.common.system.vo.LoginVo;
+import com.xcong.excoin.common.system.dto.WtWalletDto;
import com.xcong.excoin.configurations.properties.ApplicationProperties;
import com.xcong.excoin.configurations.properties.SecurityProperties;
+import com.xcong.excoin.modules.login.vo.LoginVo;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.utils.RedisUtils;
@@ -138,8 +138,8 @@
@ApiResponses({
@ApiResponse(code = 200,message = "OK",response = LoginVo.class),
})
- public Result recovery(@RequestBody WtWallet wallet) {
- return memberservice.recovery(wallet);
+ public Result loginOutCenter(@RequestBody WtWalletDto wtWalletDto) {
+ return memberservice.recovery(wtWalletDto);
}
}
--
Gitblit v1.9.1