Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

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