fix merge conflict

2025-08-06 23:34:27 +08:00 · 2023-08-21 11:55:49 +08:00
parent 1ba3f85f7e 3071983d6b
commit 96187bcd47
14 changed files with 30 additions and 29 deletions
--- a/cmdb-api/api/lib/perm/acl/audit.py
+++ b/cmdb-api/api/lib/perm/acl/audit.py
@@ -49,7 +49,6 @@ class AuditCRUD(object):

    @staticmethod
    def get_current_operate_uid(uid=None):
-
        user_id = uid or (getattr(current_user, 'uid', None)) or getattr(current_user, 'user_id', None)

        if has_request_context() and request.headers.get('X-User-Id'):