Merge branch 'feature/mzl_dev' into develop

# Conflicts: # app/common/controller/AuthController.php # app/common/logic/AuthLogic.php # app/common/model/User.php # app/controller/IndexController.php # app/functions.php # app/middleware/AuthCheck.php # app/view/index/qrcode.html # composer.json # composer.lock # config/middleware.php # config/route.php # config/whitelist.php
2025-07-11 15:21:00 +08:00
parent 3d8d9f841a
commit a6f2284f51
30 changed files with 1185 additions and 365 deletions
@@ -58,8 +58,12 @@ class User extends Model
        'phone',
        'email',
        'status',
-        'system_code',
-        'corp_id'
+        'corp_id',
+        'user_type',
+        'union_id',
+        'user_id',
+        'open_id',
+        'tenant_key'
    ];
    
    // 用户所有角色