Merge branch 'main' into zhuhao_dev

src/renderer/src/views/profile/userInfo.vue

@@ -92,7 +92,7 @@ const subjectList = ref([])
 // 获取基础的学科
 const getSubject = () => {
   //没有学科则不进行下面的步骤
-  if(!userInfo.user.subject) return
+  if(!userStore.user.subject) return
   listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
     const arr = userStore.user.subject.split(',')
     subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)