Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro i...

mk1990

2022-05-18 fe576c58384e0c1919af462ef5fc3ad8ea61da2e

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

@@ -34,7 +34,9 @@
    @Override
    public int addUser(User user) {
        User userByUsername = userMapper.getUserByUsername(user.getUsername());
        if (userByUsername != null) return 0;
        if (userByUsername != null) {
            return 0;
        }
        return userMapper.add(user);
    }
    @Override