Merge branch 'develop' into feature/mzl_dev_curd

app/common/model/Role.php

@@ -53,6 +53,6 @@ class Role extends Model
     // 角色拥有的资源（权限点、菜单）
     public function resources()
     {
-        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id')->orderBy('sort', 'asc');
+        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id');
     }
 }

app/common/model/User.php

@@ -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',
     ];
     
     // 用户所有角色