From 72b44903c7d09fa2480b94597b141415a2534639 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 18 一月 2022 13:24:57 +0800
Subject: [PATCH] Merge branch 'master' into yibin

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java |   15 +++++++++++++++
 1 files changed, 15 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 7221a5f..9fe515a 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
@@ -239,4 +239,19 @@
         LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
         return R.ok(loginReturnVO);
     }
+
+    /**
+     * 微商业街用户登录
+     *
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    @PostMapping("/loginMcsUser")
+    public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password) {
+        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password);
+        return R.ok(loginReturnVO);
+    }
 }

--
Gitblit v1.7.1