Merge branch 'sso' of shuzhihua/randd-vue into master

src/views/expert/list/index.vue

@@ -644,7 +644,7 @@ const formRules = {
   specialDirection: [{ required: true, message: '请选择专业方向', trigger: 'blur' }],
   // softwareSkills: [{ required: true, message: '请选择专业软件技能', trigger: 'blur' }],
   // teamIds: [{ required: true, message: '请选择所属团队', trigger: 'blur' }],
-  school: [{ required: true, message: '请输入毕业院校', trigger: 'blur' }],
+  // school: [{ required: true, message: '请输入毕业院校', trigger: 'blur' }],
   // birthday: [{ required: true, message: '请选择出生日期', trigger: 'blur' }],
   // avatar: [{ required: true, message: '请上传头像', trigger: 'blur' }],
   deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],