Merge remote-tracking branch 'origin/master' into pim-qiao

青城

10 天以前 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18

 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;

        }