基本完成了大部分内容的修复

api/services/prompt_service.py

@@ -635,3 +635,4 @@ class PromptService:
         except Exception as e:
             logger.error(f"受众保存到文件系统失败: {e}")
             return False 
+    

config/database.json

@@ -1,13 +1,8 @@
 {
     "host": "localhost",
     "user": "root",
-<<<<<<< HEAD
     "password": "Kj#9mP2$",
     "database": "travel_content",
-=======
-    "password": "mysql2025.",
-    "database": "bangbang",
->>>>>>> poster_update
     "port": 3306,
     "charset": "utf8mb4"
 }