Merge remote-tracking branch 'origin/master'

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

@@ -3639,6 +3639,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         result.put("defaultPaymentCalender",resultMap);
         result.put("groupTypeSet",groupType);
+        result.put("classMaxCourseNumMap",map);
         return result;
     }