Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-12-14 60dffa58131cb501480cc95b078ba8ce1ec46a9e

 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) {