Merge branch '648540858:master' into master

Iwan Lebron

2024-08-01 cfcda861640644e3597eff70775bfaf7186a55ad

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