Merge branch 'jtwy' into dev_New

zss

2 天以前 e435c834aac75f49cf2d1945bd4f849524e8b59c

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

    }