Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-13 9fb0b7d623078e90747ac4a64283f29d4b4d51d6

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