From b272fec78e30d1a10f3ab761684a119193391296 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 19 十一月 2024 17:08:57 +0800 Subject: [PATCH] 解决冲突 --- app/service/organization.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/service/organization.py b/app/service/organization.py index 67f59a9..13b9d08 100644 --- a/app/service/organization.py +++ b/app/service/organization.py @@ -1,7 +1,7 @@ import uuid -from app.Log import logger -from app.models import OrganizationModel, GroupModel +from Log import logger +from app.models import OrganizationModel from app.models.role_model import RoleModel -- Gitblit v1.8.0