Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子Li

2022-10-12 95010d4a4c21cd53b78f51cbd518a315a8861fbc

 ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java

@@ -43,9 +43,9 @@
        // 校验用户类型是否存在
        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();

        boolean captchaOnOff = configService.selectCaptchaOnOff();
        boolean captchaEnabled = configService.selectCaptchaEnabled();
        // 验证码开关
        if (captchaOnOff) {
        if (captchaEnabled) {
            validateCaptcha(username, registerBody.getCode(), registerBody.getUuid(), request);
        }