From 284a4b9bda8f7c09f550c15e71ced282e5531a08 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 08 十二月 2022 13:33:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
index 6379660..7488b98 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
@@ -41,7 +41,7 @@
if (empty || empty1) {
return R.fail("账户密码不能为空");
}
- R r = tokenService.loginGridApp(account, password);
+ R r = tokenService.loginGridApp(account, password,this.getAppId());
if (R.isOk(r)) {
LoginReturnsVO returnsVO =
JSONObject.parseObject(JSONObject.toJSONString(r.getData()), LoginReturnsVO.class);
--
Gitblit v1.7.1