Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro

# Conflicts:
#	src/main/java/com/ruoyi/ai/config/EmbeddingStoreConfig.java