Merge branch '02/24resetMain' into test

src/views/teamDetail/componentCourse/teacherList.vue

@@ -325,7 +325,7 @@
         </el-form-item>
         <el-form-item label="总课酬" prop="expectSalary">
           <span>{{
-           (activeTeacher.expectSalary+activeTeacher.subsidy)  | moneyFormat
+           ((activeTeacher&&activeTeacher.expectSalary)+(activeTeacher&&activeTeacher.subsidy))  | moneyFormat
           }}</span>
         </el-form-item>
         <br />