From 6624c5cecb52bef358057d6bde7515dd8f3b23f3 Mon Sep 17 00:00:00 2001
From: duyanhehe <duyanhex@gmail.com>
Date: Mon, 17 Mar 2025 22:17:21 +0700
Subject: [PATCH] merge
---
app/backend/main.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/backend/main.py b/app/backend/main.py
index 3931b19..08bff47 100644
--- a/app/backend/main.py
+++ b/app/backend/main.py
@@ -4,11 +4,7 @@ import os
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from fastapi import FastAPI
-<<<<<<< HEAD
-from backend.routes import auth, shop, product, category, order, orderitem
-=======
-from backend.routes import auth, shop, product, category, search
->>>>>>> c8696ef4b9c116385985bf25a8a83fe6f3317225
+from backend.routes import auth, shop, product, category, search, order, orderitem
from backend.database import init_db
from core.config import settings
@@ -26,6 +22,7 @@ app.include_router(category.router, prefix="/category", tags=["category"])
app.include_router(order.router, prefix="/order", tags=["order"])
app.include_router(orderitem.router, prefix="/orderitem", tags=["orderitem"])
+
@app.get("/")
async def root():
return {"message": "Welcome to the shopping app api"}
--
GitLab