Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd

 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;