From 6496d6a229ba8e0acd0777863fb34bee0f5ce717 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 24 十二月 2021 10:42:38 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 dde5cd0..7221a5f 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
@@ -227,4 +227,16 @@
LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
return R.ok(loginReturnVO);
}
+
+ /**
+ * 西区大屏登录
+ * @param account 账号
+ * @param password 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginXQDP")
+ public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
+ LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
+ return R.ok(loginReturnVO);
+ }
}
--
Gitblit v1.7.1