From 23a08b1a4f03a364526738e2039b07e4175eaa0f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 11 十月 2022 14:11:56 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 f54a89a..aba20f3 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
@@ -282,8 +282,8 @@
* @return 登录结果
*/
@PostMapping("/loginBatteryUser")
- public R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginBatteryUser(account, password);
+ public R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginBatteryUser(account, password,appid);
return R.ok(loginReturnVO);
}
}
--
Gitblit v1.7.1