From af0aaf0fe19dc69369ee2f7e5ca001c24353a22e Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 17:22:52 +0800
Subject: [PATCH] 冲突

---
 src/views/qualificationExamination/registrationTrainingQuery.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/qualificationExamination/registrationTrainingQuery.vue b/src/views/qualificationExamination/registrationTrainingQuery.vue
index 981f19a..e16e3d1 100644
--- a/src/views/qualificationExamination/registrationTrainingQuery.vue
+++ b/src/views/qualificationExamination/registrationTrainingQuery.vue
@@ -313,7 +313,7 @@
           //   overHidden: true,
           // },
           {
-            label: "保安公司",
+            label: "企业名称",
             prop: "deptName",
             // width: 70,
             // search: true,

--
Gitblit v1.9.3