From 7a8e31ceb01c7eb27d90197ec91efdfce4bedb41 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期三, 16 十一月 2022 18:00:39 +0800 Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua --- springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/LoginService.java | 3 ++- 1 files changed, 2 insertions(+), 1 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 bd6f71e..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 @@ -155,5 +156,5 @@ * 密码 * @return 登录结果 */ - LoginReturnVO loginBatteryUser(String account, String password); + LoginReturnVO loginBatteryUser(String account, String password,String appid); } -- Gitblit v1.7.1