Merge remote-tracking branch 'origin/6.X' into 6.X

# Conflicts:
#	ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/ruoyi-common-captcha/src/main/java/org/dromara/common/captcha/config/CaptchaConfig.java
This commit is contained in:
admin
2026-09-11 11:20:30 +08:00