Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

648540858

2022-05-18 6fa9dae824390e84e1752cd2ed402498af41d944

 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