fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java

@@ -25,18 +25,18 @@
    private SysUsersService sysUsersService;


    private String webClientId;
    private String loginQrCodeKey;

    public ScanQrCodeLogin(SysUsersService sysUsersService, String webClientId) {
    public ScanQrCodeLogin(SysUsersService sysUsersService, String loginQrCodeKey) {

        this.sysUsersService = sysUsersService;
        this.webClientId = webClientId;
        this.loginQrCodeKey = loginQrCodeKey;
    }

    @Override
    public Object login() {

        Long loginUserId = WebSoketScanQrCodeLoginObserver.getScanCashValue(webClientId);
        Long loginUserId = WebSoketScanQrCodeLoginObserver.getScanCashValue(loginQrCodeKey);

        if (loginUserId != null) {
            SysUsers loginUser = sysUsersService.findById(loginUserId);