Merge remote-tracking branch 'origin/master'

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamTeacherSalaryServiceImpl.java

@@ -222,7 +222,9 @@ public class ExamTeacherSalaryServiceImpl extends BaseServiceImpl<Long, ExamTeac
 			if(Objects.isNull(teacher)){
 				throw new BizException("教师信息异常");
 			}
-			t.setSettlementType(teacher.getSalarySettlementType());
+			if(Objects.isNull(t.getSettlementType())){
+				throw new BizException("请设置结算方式");
+			}
 			t.setTotalSettlementCost(BigDecimal.ZERO);
 			t.setTotalInvigilationStudentNum(0);
 			t.setTotalInvigilationNum(0);