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/index.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/do/a6-personnel-training/index.vue b/src/components/do/a6-personnel-training/index.vue
index 8c96312..1d81a9f 100644
--- a/src/components/do/a6-personnel-training/index.vue
+++ b/src/components/do/a6-personnel-training/index.vue
@@ -401,11 +401,13 @@
label: '璇炬椂',
prop: 'classHour',
width: '100px',
- }, {
+ },
+ {
label: '澶囨敞',
prop: 'remarks',
width: '100px',
- }, {
+ },
+ {
dataType: 'action',
width: '180',
label: '鎿嶄綔',
--
Gitblit v1.9.3