Merge branch 'talk' into main-dev

648540858

2023-03-20 039fbf7e243d4bf0f46b44e7dae2a5d36e978056

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

}