Merge branch 'develop' into feature/mzl_dev_curd

2025-07-21 15:10:14 +08:00
parent 45679bc5e4
commit 149de9d6fb
35 changed files with 2112 additions and 16 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',
    ];
    
    // 用户所有角色