Merge branch 'wvp-28181-2.0' of https://github.com/ixingqiao/wvp-GB28181-pr...

xingqiao

2022-08-26 fa0660291055ec113f9982270c27ebc45bec16ce

 src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java

@@ -7,6 +7,7 @@
    private String password;
    private String createTime;
    private String updateTime;
    private String pushKey;
    private Role role;

    public int getId() {
@@ -56,4 +57,12 @@
    public void setRole(Role role) {
        this.role = role;
    }

    public String getPushKey() {
        return pushKey;
    }

    public void setPushKey(String pushKey) {
        this.pushKey = pushKey;
    }
}