Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/views/career/zhiyuan/components/zhiyuan-list.vue

@@ -34,7 +34,7 @@
       <!--   历年 -->
       <div class="f14">
         <p>{{ row.history ? row.history.year || '-' : '-' }}</p>
-        <p>row.history.type || ''</p>
+        <p>{{row.history.type || ''}}</p>
       </div>
     </template>
     <template #t4="{row}">

src/views/elective/generation/detail.vue

@@ -213,7 +213,7 @@ export default {
       this.loading = true
       this.majorsMap = null
       getElectiveGenerationDetails(params).then(res => {
-        this.total = res['total'] || 0
+        this.total = res['total'] || res.data?.total || 0
         this.detailWrapper = res.data
 
         const studentIds = res.data.details?.map(d => d['studentId']).toString()