Merge branch 'ol_12_30' into online

src/views/teamDetail/components/modals/course-time-detail.vue

@@ -116,7 +116,8 @@ export default {
           ('' + item.phone).indexOf(keyword) > -1 ||
           ('' + item.username).indexOf(keyword) > -1
         )
-        const couse = !hastimer || (hastimer == '1' && item.mapDtos.filter(dto => dto.value > 0).length)
+        const length = item.mapDtos.filter(dto => dto.value > 0).length
+        const couse = !hastimer || (hastimer == '1' && length || hastimer == '0' && !length)
         return user && couse
       })
     },