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

648540858

2021-11-22 3e76214d0768abe027e10d983015cfb4d820a6d9

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

@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf.security.dto;

import com.genersoft.iot.vmp.storager.dao.dto.Role;
import com.genersoft.iot.vmp.storager.dao.dto.User;
import org.springframework.security.core.CredentialsContainer;
import org.springframework.security.core.GrantedAuthority;
@@ -92,4 +93,10 @@
    public int getId() {
        return user.getId();
    }

    public Role getRole() {
        return user.getRole();
    }


}