Merge branch 'ol_12_30' into 11/24SAAS

src/views/resetTeaming/modals/review-detail.vue

@@ -84,7 +84,7 @@
     <el-table
       :data="course"
       stripe
-      v-if="course.length"
+      v-if="course&&course.length"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
@@ -266,7 +266,7 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="activity.length > 0"
+      v-if="activity&&activity.length > 0"
     >
     </el-alert>
     <el-table