Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

14 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

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

    }