Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-07-31 3cada227435934da8a2db49939695f870b7f477e

 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;