Merge remote-tracking branch 'origin/master'

Tcsm

2023-04-07 5c65abf0df7ec60e97438245a6b930f919c532dc

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