From 45df31e0510e9f05051cd7516949805a8e8dac17 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 18:01:20 +0800
Subject: [PATCH] 冲突
---
src/views/applyexam/index.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/views/applyexam/index.vue b/src/views/applyexam/index.vue
index d855442..8ada691 100644
--- a/src/views/applyexam/index.vue
+++ b/src/views/applyexam/index.vue
@@ -103,11 +103,7 @@
:type="type"
size="small"
icon="el-icon-receiving"
-<<<<<<< HEAD
v-if="permission.applyexam_print && row.candidateNo!=''"
-=======
- v-if="row.candidateNo != ''"
->>>>>>> cb81eef3d9aabe280e506fc7971c539542cf13f7
@click="handlePrint(row)"
>准考证打印
</el-button>
--
Gitblit v1.9.3