Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2023-06-10 52f9c295f90188d3346b9c129a00e817ab7f14e4

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