Merge cangpin and resolve conflict

2026-03-24 22:31:29 +08:00 · 2026-03-24 22:31:29 +08:00 · bb33d37087
parent 3a2dd39df3
commit bb33d37087
1 changed files with 5 additions and 0 deletions
--- 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