From bb33d3708753d760f5aff3265cf9188fadd82d98 Mon Sep 17 00:00:00 2001
From: longda <coolbot@163.com>
Date: Tue, 24 Mar 2026 22:31:29 +0800
Subject: [PATCH] Merge cangpin and resolve conflict

---
 backend/app/core/database.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/backend/app/core/database.py b/backend/app/core/database.py
index fffbbdd..f4852d1 100644
--- a/backend/app/core/database.py
+++ b/backend/app/core/database.py
@@ -11,8 +11,13 @@ DATABASE_URL = os.getenv(
 engine = create_engine(
     DATABASE_URL,
     pool_pre_ping=True,
+<<<<<<< Updated upstream
     pool_size=20,
     max_overflow=40,
+=======
+    pool_size=20,
+    max_overflow=40,
+>>>>>>> Stashed changes
     pool_recycle=3600,
     pool_timeout=30,
     echo=False