Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service/blade-client/src/main/java/org/springblade/client/school/controller/SchoolTeacherController.java

@@ -155,9 +155,9 @@ public class SchoolTeacherController extends BladeController {
 		if (StringUtils.isBlank(schoolTeacher.getIdNumber())){
 			throw new SecurityException("身份证号不能为空");
 		}
-		if (StringUtils.isBlank(schoolTeacher.getCode())){
+		/*if (StringUtils.isBlank(schoolTeacher.getCode())){
 			throw new SecurityException("工号不能为空");
-		}
+		}*/
 		if (StringUtils.isBlank(schoolTeacher.getCname())){
 			throw new SecurityException("姓名不能为空");
 		}

blade-service/blade-client/src/main/java/org/springblade/client/school/excel/SchoolTeacherExcel.java

@@ -65,12 +65,12 @@ public class SchoolTeacherExcel implements Serializable {
 	/**
 	 * 是否班主任
 	 */
-	@ApiModelProperty(value = "是否班主任")
+	@ExcelProperty(value = "是否班主任")
 	private String doubleTeachers;
 	/**
 	 * 职务
 	 */
-	@ApiModelProperty(value = "职务")
+	@ExcelProperty(value = "职务")
 	private String compileCategory;
 	/**
 	 * 备注

blade-service/blade-client/src/main/java/org/springblade/client/school/service/impl/SchoolTeacherServiceImpl.java

@@ -113,10 +113,10 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 				errMsg.append("第"+(i+2)+"行,身份证号码为空,");
 				continue;
 			}
-			if (StringUtils.isBlank(schoolTeacherExcel.getCode())){
+			/*if (StringUtils.isBlank(schoolTeacherExcel.getCode())){
 				errMsg.append("第"+(i+2)+"行,工号为空,");
 				continue;
-			}
+			}*/
 			if (StringUtils.isBlank(schoolTeacherExcel.getCname())){
 				errMsg.append("第"+(i+2)+"行,姓名为空,");
 				continue;