Merge remote-tracking branch 'origin/master'

Tcsm

2023-09-25 7bee61be8fba5c23999dc9e826e6af9de98db469

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

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