Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-15 bb5be7a8a6ac24fbf66f03f070751577b87c95ca

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