Merge branch 'feature/user0812' into develop_bm

# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php

app/common/model/User.php

@@ -15,7 +15,8 @@ use support\Model;
  * @property string $email 邮箱
  * @property integer $status 状态
  * @property string $system_code 系统码
- * @property string $created_at 
+ * @property string $report_to 上级用户ID
+ * @property string $created_at
  * @property string $updated_at
  */
 class User extends Model
@@ -69,6 +70,7 @@ class User extends Model
         'position',
         'socialize',
         'socialize_pic',
+        'report_to',
     ];
     
     // 用户所有角色