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

liyong

6 天以前 936f4bd8b7837051ff63773be6d2d9c4b402b168

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

    }