From c161f76f78fead2519b8a66ab30d6e7389deead1 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:15:02 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..3ad4df2 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
@@ -56,7 +56,7 @@
StatisticsBusinessDataJob sjobp;
@RequestMapping(value = "/job")
public @ResponseBody String job() {
- sjobp.executeExt2();
+ //sjobp.executeExt2();
return "1";
}
@@ -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