From 2b6c540c6b20e04f8b2a05e6f0c22ba5d5016364 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 14:09:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ 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