From 74570c3c6b01ef869824030ad110e6b930fa5e08 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期日, 26 九月 2021 16:43:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_bak' into test_bak

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
index f3f6943..a0f7592 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java
@@ -103,4 +103,23 @@
      * @return  登录结果
      */
     LoginReturnVO loginCgBackage(String account, String password);
+
+    /**
+     * 一键报警APP登录
+     *
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    LoginReturnsVO loginAlarmApp(String account, String password);
+
+    /**
+     * 便民服务商家后台登录
+     * @param account 账户
+     * @param password 密码
+     * @return 登录结果
+     */
+    LoginReturnVO loginMerchantBackStage(String account, String password);
 }

--
Gitblit v1.7.1