From dd929871969c4275eeb3246d7c5c0d6f35060b10 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 14:52:47 +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