Merge remote-tracking branch 'origin/master'

Tcsm

2023-08-15 cdb9af95c54f21aafe3c554e5a9938421d9b1311

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

@@ -89,6 +89,9 @@

        ajax.put("uuid", uuid);
        ajax.put("img", Base64.encode(os.toByteArray()));
        ajax.put("code",200);
        ajax.put("value",code);
        ajax.put("txt","77777");
        return ajax;
    }
}