fix: cambios locales antes del merge

backend/api/v1/modules/a76/general_catalogs/classification_concepts/routes.py

@@ -11,10 +11,13 @@ router = TenantCRUDRoutes(
     tags=["a76.general_catalogs.classification_concepts"],
     resource_name="Classification Concept",
     enable_list=True,
-    enable_filters=True,
+<<<<<<< HEAD
     list_permissions=["cat_classification.view"],
     get_permissions=["cat_classification.view"],
     create_permissions=["cat_classification.create"],
     update_permissions=["cat_classification.edit"],
     delete_permissions=["cat_classification.delete"],
+=======
+    enable_filters=True,
+>>>>>>> 88ab6b45df947b2091e7cd5fff7468284a0ceef6
 ).router

backend/api/v1/modules/a76/general_catalogs/doda/routes.py

@@ -155,6 +155,8 @@ async def export_doda_pedimentos(
 
 
 # Incluir rutas CRUD (contiene GET /{id}, POST /, PUT /{id}, DELETE /{id}).
+# Se registra DESPUÉS de los endpoints literales para que /export, /alta-logs,
+# /alta-status no sean capturados por el parámetro /{id}.
 _crud_router = TenantCRUDRoutes(
     service=DodaService,
     create_schema=DodaCreateDTO,
@@ -167,8 +169,13 @@ _crud_router = TenantCRUDRoutes(
     enable_list=True,
     enable_filters=True,
 ).router
+<<<<<<< HEAD
 
+router = crud_router
+
+=======
 router.include_router(_crud_router)
+>>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 
 
 @router.get(
@@ -192,6 +199,8 @@ async def get_doda_detail(
     return DodaDetailResponseDTO.model_validate(doda)
 
 
+<<<<<<< HEAD
+=======
 @router.get(
     "/{doda_id}/print",
     summary="Imprimir DODA (PDF)",
@@ -273,6 +282,7 @@ async def print_doda_pdf(
 
 
 # ============ CONTAINERS ENDPOINTS ============
+>>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 @router.get(
     "/{doda_id}/containers",
     response_model=List[DodaContainerResponseDTO],
@@ -331,6 +341,8 @@ async def update_container(
     return DodaContainerResponseDTO.model_validate(container)
 
 
+<<<<<<< HEAD
+=======
 @router.delete(
     "/{doda_id}/containers/{container_line}",
     status_code=status.HTTP_204_NO_CONTENT,
@@ -406,6 +418,7 @@ async def delete_container_seal(
 
 
 # ============ AMERICAN PEDIMENTOS ENDPOINTS ============
+>>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 @router.get(
     "/{doda_id}/american-pedimentos",
     response_model=List[DodaAmericanPedimentoResponseDTO],
@@ -441,6 +454,8 @@ async def add_american_pedimento(
     return DodaAmericanPedimentoResponseDTO.model_validate(pedimento)
 
 
+<<<<<<< HEAD
+=======
 # ============ AMERICAN PEDIMENTOS (DELETE) ============
 @router.delete(
     "/{doda_id}/american-pedimentos/{pedimento_line}",
@@ -458,6 +473,7 @@ async def delete_american_pedimento(
 
 
 # ============ PEDIMENTOS ENDPOINTS ============
+>>>>>>> 103363c6315f9235252cc443c8e0093ba401c6c2
 @router.get(
     "/{doda_id}/pedimentos",
     response_model=List[DodaPedimentoResponseDTO],