Merge branch 'master' of http://gitlab.frkj.cc/php/zhjwxt

# Conflicts:
#	admin/src/app/views/campus_person_role/campus_person_role.vue

niucloud/app/service/api/login/LoginService.php

@@ -375,6 +375,7 @@ class LoginService extends BaseApiService
         //获取用户部门ids（1市场、2教师、3销售）
         $depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id');
         $user_type = in_array($params['login_type'],$depts) ? $params['login_type'] : '';
+
         return [
             'token' => $token_info['token'],//token
             'expires_time' => $token_info['params']['exp'],//过期时间