diff --git a/app/api/endpoints/station.py b/app/api/endpoints/station.py index 103e1d1..00768a3 100644 --- a/app/api/endpoints/station.py +++ b/app/api/endpoints/station.py @@ -2,11 +2,11 @@ from fastapi import APIRouter, Depends from sqlalchemy.orm import Session from typing import List, Optional from app.models.station import StationDB, StationCreate, StationUpdate, StationInfo +from app.models.community import CommunityDB from app.models.database import get_db from app.api.deps import get_admin_user from app.models.user import UserDB from app.core.response import success_response, error_response, ResponseModel -from app.models.community import CommunityDB router = APIRouter() @@ -33,7 +33,7 @@ async def get_stations( """获取驿站列表""" # 联表查询,获取社区名称 query = db.query( - StationDB, + StationDB, CommunityDB.name.label('community_name') ).join( CommunityDB, diff --git a/app/models/station.py b/app/models/station.py index 5f51bae..94c3979 100644 --- a/app/models/station.py +++ b/app/models/station.py @@ -26,7 +26,6 @@ class StationUpdate(BaseModel): class StationInfo(BaseModel): id: int name: str - address: str community_id: int community_name: Optional[str] = None