From c18037dc5de7f67175c2cf80cd04761d198739b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48:50 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
index 45bc96a..18eb754 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
@@ -112,7 +112,7 @@
LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);
user = authorityManager.login(apLogin);
}else {
- ScanQrCodeLogin apLogin = new ScanQrCodeLogin( sysUsersService,webLoginDto.getWebClientId());
+ ScanQrCodeLogin apLogin = new ScanQrCodeLogin( sysUsersService,webLoginDto.getLoginQrCodeKey());
user = authorityManager.login(apLogin);
}
--
Gitblit v1.9.1