Merge remote-tracking branch 'upstream/main' into dev

# Conflicts:
#	app/api/alibaba.ts
#	app/api/anthropic.ts
#	app/api/azure.ts
#	app/api/baidu.ts
#	app/api/bytedance.ts
#	app/api/openai.ts
#	yarn.lock
This commit is contained in:
sijinhui
2024-08-05 14:44:13 +08:00
14 changed files with 331 additions and 204 deletions

View File

@@ -34,7 +34,6 @@
"echarts": "^5.4.3",
"emoji-picker-react": "^4.9.2",
"fuse.js": "^7.0.0",
"hash.js": "^1.1.7",
"heic2any": "^0.0.4",
"html-to-image": "^1.11.11",
"lodash-es": "^4.17.21",