Merge branch 'master' into develop-add-api-key

leesam

2024-04-01 23beb4fde063b4a648c2a273f17cf5c423fa0ae6

 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;