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

maven

20 小时以前 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3

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

    }