Merge remote-tracking branch 'upstream/main' into rebuild/auth-identity-foundation

# Conflicts:
#	backend/internal/service/openai_images.go
This commit is contained in:
IanShaw027
2026-04-22 18:13:05 +08:00
11 changed files with 523 additions and 71 deletions

View File

@@ -628,11 +628,12 @@
</div>
</div>
<!-- 图片生成计费配置antigravity 和 gemini 平台) -->
<!-- 图片生成计费配置 -->
<div
v-if="
createForm.platform === 'antigravity' ||
createForm.platform === 'gemini'
createForm.platform === 'gemini' ||
createForm.platform === 'openai'
"
class="border-t pt-4"
>
@@ -1750,11 +1751,12 @@
</div>
</div>
<!-- 图片生成计费配置antigravity 和 gemini 平台) -->
<!-- 图片生成计费配置 -->
<div
v-if="
editForm.platform === 'antigravity' ||
editForm.platform === 'gemini'
editForm.platform === 'gemini' ||
editForm.platform === 'openai'
"
class="border-t pt-4"
>