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

2026-01-23 16:55:09 +08:00
parent d458413e4b 7229017e16
commit bc2e2492fc
3 changed files with 122 additions and 1 deletions
--- a/core/managers/permission_manager.py
+++ b/core/managers/permission_manager.py
@@ -412,7 +412,11 @@ class PermissionManager(Singleton):
        """
        try:
            # 创建空的权限数据
+<<<<<<< HEAD
            empty_data: Dict[str, Dict] = {"users": {}}
+=======
+            empty_data = {"users": {}}
+>>>>>>> 7229017e16735aef7dfc8379e31646b7a382d135
            
            # 原子性写入文件
            temp_file = self.data_file + ".tmp"