Merge branch 'refs/heads/世锦赛线上' into 世锦赛

# Conflicts:
#	src/viewsPc/match/components/affix-invitation.vue
#	vite.config.js

@@ -232,8 +232,8 @@
                 </template>
                 <template #default="scope">
                   <el-select v-model="scope.row.nationality" filterable size="small">
-                    <!--                    <el-option v-for="item in countrys" :key="item.id" :label="item.noc" :value="item.id"/>-->
-                    <el-option v-for="item in countrys" :key="item.id" :label="item.noc" :value="item.noc"/>
+                    <el-option v-for="item in countrys" :key="item.id" :label="item.noc"
+                               :value="item.id"/>
                   </el-select>
                 </template>
               </el-table-column>