fix: cambios locales antes del merge

2026-04-27 14:32:28 -05:00
parent c8e45f5ce2
commit c87865bcc5
40 changed files with 3716 additions and 2660 deletions
--- a/backend/api/v1/modules/public/reference_data/containers/routes.py
+++ b/backend/api/v1/modules/public/reference_data/containers/routes.py
@@ -16,8 +16,11 @@ router = APIRouter(prefix="/containers")
 async def list_containers(
    page: int = Query(1, ge=1, description="Número de página"),
    page_size: int = Query(50, ge=1, le=100, description="Tamaño de página"),
+<<<<<<< HEAD
    company_id: int = Query(..., description="ID de la empresa"),
+=======
    search: str = Query(None, description="Término de búsqueda"),
+>>>>>>> 88ab6b45df947b2091e7cd5fff7468284a0ceef6
    db: Session = Depends(get_core_db),
    current_user: dict = Depends(get_current_user),
 ):