Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 f4d47d91a8bf41426497a0c42c10f5a78af0259b

 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);