Merge branch 'develop'

2025-07-29 09:00:04 +08:00
parent a551507e4d
commit d74b374198
106 changed files with 6754 additions and 1346 deletions
@@ -54,6 +54,7 @@ class User extends Model
        'sn',
        'name',
        'avatar',
+        'sex',
        'password',
        'phone',
        'email',
@@ -63,7 +64,11 @@ class User extends Model
        'union_id',
        'user_id',
        'open_id',
-        'tenant_key'
+        'tenant_key',
+        'country_id',
+        'position',
+        'socialize',
+        'socialize_pic',
    ];
    
    // 用户所有角色
@@ -91,4 +96,4 @@ class User extends Model
                    ->orWhere('phone', $account)
                    ->orWhere('email', $account);
    }
-}
+}