Merge branch '20200324' into test

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

@@ -940,7 +940,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     onlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.ONLINE);
                 }
                 if(teachModeCourseNumMap.containsKey(TeachModeEnum.OFFLINE)){
-                    onlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.OFFLINE);
+                    offlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.OFFLINE);
                 }
                 if (onlineCourseNum > 0 && offlineCourseNum <= 0) {
                     e.setClassMode(1);