Merge branch 'dev' of https://github.com/Fairy-Oracle-Sanctuary/NeoBot into dev

src/neobot/core/managers/permission_manager.py

@@ -433,10 +433,17 @@ def require_admin(func):
     """
     from functools import wraps
     from neobot.models.events.message import MessageEvent
+<<<<<<< HEAD
     from neobot.core.managers import permission_manager
 
     @wraps(func)
     async def wrapper(event: MessageEvent, *args, **kwargs):
+=======
+
+    @wraps(func)
+    async def wrapper(event: MessageEvent, *args, **kwargs):
+        from neobot.core.managers import permission_manager
+>>>>>>> eb9079744c82f8e254de084a3a089ef91c37e9dc
         pm = permission_manager
         if not await pm.is_admin(event.user_id):
             await event.reply("此命令仅限管理员使用")