Merge branch 'main' into main-dev

648540858

2023-04-03 786c76ba714321c2d481b32afbb619a33f7c11a9

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

@@ -98,5 +98,8 @@
        return user.getRole();
    }

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

}