merge and resolve conflicts

This commit is contained in:
RockYang
2025-10-27 16:21:46 +08:00
parent a9f11d79a9
commit 499f5c915f
10 changed files with 86 additions and 202 deletions
+1 -1
View File
@@ -6,6 +6,6 @@ VUE_APP_ADMIN_USER=admin
VUE_APP_ADMIN_PASS=admin123
VUE_APP_KEY_PREFIX=GeekAI_DEV_
VUE_APP_TITLE="Geek-AI 创作系统"
VUE_APP_VERSION=v4.1.8
VUE_APP_VERSION=v4.1.9
VUE_APP_DOCS_URL=https://docs.geekai.me
VUE_APP_GIT_URL=https://github.com/yangjian102621/geekai