Merge branch 'refs/heads/2.7.0'

648540858

2024-04-23 d41d6b34af2485198ed01e1888db1571e4da1a6a

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