From 10cc0db30a1be5377e4c09bce349014a667849b6 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 12 一月 2022 13:21:08 +0800
Subject: [PATCH] Merge branch 'phs' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
index 419553a..ccd4d75 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -142,4 +142,16 @@
      */
     @PostMapping("/loginXQDP")
     R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password);
+
+    /**
+     * 微商业街用户登录
+     *
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    @PostMapping("/loginMcsUser")
+    R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password);
 }

--
Gitblit v1.7.1