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

zss

3 天以前 94e23a3d587846f10ea9517bd2e6705093d6a99a

 src/main/java/com/ruoyi/project/common/CaptchaController.java

@@ -51,9 +51,9 @@
    public AjaxResult getCode(HttpServletResponse response) throws IOException

    {

        AjaxResult ajax = AjaxResult.success();

        boolean captchaOnOff = configService.selectCaptchaOnOff();

        ajax.put("captchaOnOff", captchaOnOff);

        if (!captchaOnOff)

        boolean captchaEnabled = configService.selectCaptchaEnabled();

        ajax.put("captchaEnabled", captchaEnabled);

        if (!captchaEnabled)

        {

            return ajax;

        }