OriusTecnologia/saas_api
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Merge): Corrige erro de conflito de merge

Browse source
This commit is contained in:
Keven Willian Pereira de Souza 2025-10-30 16:07:47 -03:00
parent e871333992
commit 11c43f22e4
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
packages/v1/api.py
View file

@ -50,8 +50,6 @@ from packages.v1.servicos.balcao.endpoints import (
t_servico_itempedido_endpoint,
t_servico_pedido_endpoint,
)
from packages.v1.administrativo.endpoints import g_emolumento_endpoint
from packages.v1.administrativo.endpoints import g_emolumento_item_endpoint
# Cria uma instância do APIRouter que vai agregar todas as rotas da API
api_router = APIRouter()
@ -312,6 +310,13 @@ api_router.include_router(
tags=["Emolumentos"],
)
# Inclui as rotas de g_emolumento_item
api_router.include_router(
g_emolumento_item_endpoint.router,
prefix="/administrativo/g_emolumento_item",
tags=["Emolumento Item"],
)
# Inclui as rotas de g_emolumento periodo
api_router.include_router(
g_emolumento_periodo_endpoint.router,
@ -353,17 +358,3 @@ api_router.include_router(
prefix="/servicos/balcao/t_servico_itempedido",
tags=["Itens do Pedido"],
)
# Inclui as rotas de g_emolumento
api_router.include_router(
g_emolumento_endpoint.router,
prefix="/administrativo/g_emolumento",
tags=["Emolumentos"],
)
# Inclui as rotas de g_emolumento_item
api_router.include_router(
g_emolumento_item_endpoint.router,
prefix="/administrativo/g_emolumento_item",
tags=["Emolumento Item"],
)