Merge branch 'wvp-28181-2.0' into feature/record

648540858

2023-12-18 67d1ff0d263f8179ca24d875f39b9186268d3dfa

 src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java

@@ -144,6 +144,7 @@
            jwtUser.setUserName(username);
            jwtUser.setPassword(user.getPassword());
            jwtUser.setRoleId(user.getRole().getId());
            jwtUser.setUserId(user.getId());

            return jwtUser;
        } catch (InvalidJwtException e) {