Merge branch 'wxl_01_27' into online

src/views/studentManager/components/studentRecord.vue

@@ -199,8 +199,8 @@
               <template slot-scope="scope">
                 <div>
                   <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }} -->
-                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
-                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
+                  {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
+                  {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
                 </div>
               </template>
             </el-table-column>

src/views/studentManager/components/teamAndcourse.vue

@@ -154,8 +154,8 @@
               <template slot-scope="scope">
                 <div>
                   <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }} -->
-                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
-                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
+                  {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
+                  {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
                 </div>
               </template>
             </el-table-column>