Merge branch '01/21VipReset' into online

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -67,6 +67,11 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="是否回访">
+          <template slot-scope="scope">
+            <div>{{ scope.row.visitFlag | yesOrNo }}</div>
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          prop="ctrls"
                          v-if="permission('visit/add?page=teamCourseList')"

src/views/teamDetail/componentCourse/teacherList.vue

@@ -101,6 +101,13 @@
         </template>
       </el-table-column>
       <el-table-column align='center'
+                       prop="disposeContent"
+                       label="处理意见">
+        <template slot-scope="scope">
+          <overflow-text width="100%" :text="scope.row.teacherAttendance && scope.row.teacherAttendance.disposeContent"></overflow-text>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
                        width="200px"
                        fixed="right"
                        label="操作">