Merge remote-tracking branch 'origin/master'

linwenling

2023-08-29 b8670cd94a61846ac63573f724fcf91d8dd7be88

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -91,6 +91,7 @@
        ajax.put("img", Base64.encode(os.toByteArray()));
        ajax.put("code",200);
        ajax.put("value",code);
        ajax.put("txt","77777");
        return ajax;
    }
}