Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

昨天 1bc0c6c7842e29711e576e58b0aca00fabd92df0

 src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -157,6 +157,7 @@
        }

        user.setCreateBy(getUsername());

        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

        user.setTenantId(user.getDeptId());

        return toAjax(userService.insertUser(user));

    }