Merge branch 'master' into test

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

@@ -262,11 +262,14 @@ public class CourseScheduleController extends BaseController {
     @ApiOperation(value = "课时交换")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseSwap')")
     @GetMapping(value = "/courseSwap",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2){
+    public Object courseSwap(Long courseScheduleId1,Long courseScheduleId2, Boolean allowZeroSalary){
         if(Objects.isNull(courseScheduleId1)||Objects.isNull(courseScheduleId2)){
             return failed("请指定课程");
         }
-        courseScheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
+        if(Objects.isNull(allowZeroSalary)){
+            allowZeroSalary = false;
+        }
+        courseScheduleService.courseSwap(courseScheduleId1,courseScheduleId2,allowZeroSalary);
         return succeed();
     }