From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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