From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/a6-personnel/training-record.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/do/a6-personnel/training-record.vue b/src/components/do/a6-personnel/training-record.vue
index ffafce3..cfc5c2f 100644
--- a/src/components/do/a6-personnel/training-record.vue
+++ b/src/components/do/a6-personnel/training-record.vue
@@ -164,10 +164,12 @@
}, {
label: '鍩硅鍐呭',
prop: 'trainingContent'
- }, {
- label: '鍩硅璇炬椂',
- prop: 'educationBackground'
- }, {
+ },
+ // {
+ // label: '鍩硅璇炬椂',
+ // prop: 'educationBackground'
+ // },
+ {
label: '璇炬椂',
prop: 'classHour'
}, {
--
Gitblit v1.9.3