merge v4.1.0 and fixed conflicts

This commit is contained in:
RockYang
2024-10-08 17:54:08 +08:00
90 changed files with 3185 additions and 3137 deletions
+1 -1
View File
@@ -6,4 +6,4 @@ VUE_APP_ADMIN_USER=admin
VUE_APP_ADMIN_PASS=admin123
VUE_APP_KEY_PREFIX=ChatPLUS_DEV_
VUE_APP_TITLE="Geek-AI 创作系统"
VUE_APP_VERSION=v4.0.9
VUE_APP_VERSION=v4.1.0