Merge branch 'master' into 2.7.0

648540858

2024-03-28 cf3d98102ae0535c268886802a2cfc65dcdeb167

 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;