Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -69,7 +69,7 @@ public class ClassGroupController extends BaseController {
     @PostMapping("/delMix")
     @PreAuthorize("@pcs.hasPermissions('classGroup/delMix')")
     public Object delMix(Integer classGroupId) {
-        classGroupService.delete(classGroupId);
+        classGroupService.delMix(classGroupId);
         return succeed();
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -162,6 +162,7 @@ public class VipGroupManageController extends BaseController {
 		model.put("student", student.getUsername());
 		model.put("teacher", teacher.getUsername());
 		model.put("className", vipGroup.getName());
+		model.put("studentApplyRefunds", studentApplyRefunds);
 
 		return succeed(model);
 	}