Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/supermarkpp into master

src/views/school/TeacherList.vue

@@ -1,12 +1,13 @@
 <style lang="scss">
-	.area{
-		.el-select{
+	.area {
+		.el-select {
 			width: 120px;
 			display: inline-block;
 			margin-right: 6px;
 		}
 	}
-	.upload_demo{
+
+	.upload_demo {
 		display: inline-block;
 		margin: 0 5px;
 	}
@@ -181,7 +182,7 @@
 		    >
 				<el-option label="男" value="男"></el-option>
 				<el-option label="女" value="女"></el-option>
-		      </el-option>
+		     
 		    </el-select>
 		  </el-form-item>
 		  <el-form-item label="年龄" prop="age">