Merge branch '2.7.0'

648540858

2024-04-11 9978d30aa1533c50bfaa48e44a1b0de4c157d10b

 src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java

@@ -32,6 +32,11 @@
    }

    @Override
    public User getUserById(int id) {
        return userMapper.selectById(id);
    }

    @Override
    public User getUserByUsername(String username) {
        return userMapper.getUserByUsername(username);
    }