From f378fbf3ee8bd599b0746e48ba3811ae4b8b87cd Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 26 六月 2024 16:56:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/answer/list.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index aa567ed..a408eec 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -28,7 +28,7 @@
<span v-if="row.paperType === 3">椤哄簭璇曞嵎</span>
</template>
</el-table-column>
- <el-table-column align="center" prop="num" label="棰樼洰鏁伴噺" width="100px" />
+ <el-table-column align="center" prop="questionCount" label="棰樼洰鏁伴噺" width="100px" />
<el-table-column align="center" prop="systemScore" label="鎬诲垎" width="100px" />
<el-table-column align="center" prop="suggestTime" label="寤鸿鏃堕暱" width="100px" />
<el-table-column align="center" prop="personAnswerNum" label="鍙傝�冧汉鏁�" width="100px">
@@ -36,7 +36,7 @@
<span>{{ row.personAnswerNum + "/" + row.personTotalNum }}</span>
</template>
</el-table-column>
- <el-table-column align="center" prop="userName" label="鍒涘缓浜�" width="100px" />
+ <el-table-column align="center" prop="userName" label="鍙戣捣浜�" width="100px" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="{row}">
<el-button size="mini" @click="view(row)">鏌ョ湅</el-button>
--
Gitblit v1.8.0