From 1b6430587fcf72e58510a32f7e6c88bda565f62e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 23 九月 2022 17:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java |   12 ++++++++++++
 1 files changed, 12 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 3ba7520..4551207 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
@@ -2,6 +2,7 @@
 
 import com.panzhihua.common.model.vos.LoginReturnVO;
 import com.panzhihua.common.model.vos.LoginReturnsVO;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -145,4 +146,15 @@
      * @return 登录结果
      */
     LoginReturnVO tfLogin(String account, String password,String appid);
+
+    /**
+     * 电动车商城后台用户登录
+     *
+     * @param account
+     *            账户
+     * @param password
+     *            密码
+     * @return 登录结果
+     */
+    LoginReturnVO loginBatteryUser(String account, String password,String appid);
 }

--
Gitblit v1.7.1