Merge branch 'master' into develop

TEAMModelOS/ClientApp/src/view/mycourse/MyCourse.vue

@@ -1023,7 +1023,7 @@ export default {
                                             })
                                             item.listName = listInfo ? listInfo.name : this.$t('cusMgt.hasDelClass')
                                             item.listSchool = listInfo ? listInfo.school : undefined
-                                            item.joinLock = listInfo.joinLock
+                                            item.joinLock = listInfo?.joinLock
                                         }
                                         //统一数据格式
                                         item.classId = item.classId || undefined

TEAMModelOS/ClientApp/src/view/mycourse/exam/CreatePrivExam.vue

@@ -657,7 +657,7 @@ export default {
             if (groupRes.length > 1) {
                 this.targets = [[classInfo.type, classInfo.id]]
             } else {
-                this.targets = [defaultClass]
+                this.targets = [[defaultClass]]
             }
             this.evaluationInfo.targets = this.targets
             this.evaluationInfo.subjects = []