Merge branch 'master' into dev/abl支持

648540858

2024-03-29 03248551906304a182d489ad90654d72a491791c

 src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java

@@ -100,6 +100,9 @@
        return user.getRole();
    }

    public String getPushKey() {
        return user.getPushKey();
    }

    public String getAccessToken() {
        return accessToken;