Merge branch 'colexiu1.3'

src/tenant/music/train-list/index.tsx

@@ -154,7 +154,7 @@ export default defineComponent({
                                   {searchObj.value.subjects.map(
                                     (subject: any) => {
                                       const isActive =
-                                        subject.id === params.subjectId || null
+                                        subject.id === params.subjectId
                                       const type = isActive
                                         ? 'primary'
                                         : 'default'