From 503135f1f8a7cfed29cac1786a6a7c8758eed8d3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 16 七月 2021 10:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
index d2086c3..59386ca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.exceptions.TokenException;
import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.JWTTokenUtil;
@@ -153,7 +154,7 @@
*/
@PostMapping("/loginGridApp")
public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginGridApp(account, password);
+ LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password);
return R.ok(loginReturnVO);
}
--
Gitblit v1.7.1