Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -3348,11 +3348,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             teacherAttendanceDao.updateViPSignOutStatus(courseScheduleIdList.stream().map(a -> a.toString()).collect(Collectors.joining(",")));
         }*/
 
-		try {
-			practiceGroupService.practiceGroupRenewRemind();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+//		try {
+//			practiceGroupService.practiceGroupRenewRemind();
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
 
 		return true;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherDefaultMusicGroupSalaryServiceImpl.java

@@ -137,7 +137,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 											throw new BizException("课酬设置不完整");
 										}
 										Integer studentNum = classGroupStudentNumMap.get(ts.getClassGroupId());
-										if(studentNum == null){
+										if(studentNum == null || studentNum == 0){
 											studentNum = 1;
 										}
 										ts.setExpectSalary(new BigDecimal(obj.getDouble(studentNum + "")));