feat：1212活动

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

@@ -4484,7 +4484,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				result.setSettlementTime(coursesSettlementTimeMap.get(result.getId()));
 				result.setIsSettlement(Objects.isNull(result.getSettlementTime())?0:1);
 				if(courseMergeCourseNumMap.containsKey(result.getId())){
-					result.setBeMerged(courseMergeCourseNumMap.get(result.getId())>0?true:false);
+					result.setBeMerged(courseMergeCourseNumMap.get(result.getId())>(long)0?true:false);
 				}
 			}
         }