Merge branch 'main' into main2

648540858

2023-01-05 6fa5b37b962b05b3aa4b7bf019eb47c4cdbb5738

 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();
    }

}