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/caorui/Department/components/Plan/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/caorui/Department/components/Plan/index.vue b/src/components/caorui/Department/components/Plan/index.vue
index 518316c..bb439d8 100644
--- a/src/components/caorui/Department/components/Plan/index.vue
+++ b/src/components/caorui/Department/components/Plan/index.vue
@@ -215,8 +215,8 @@
label: '澶囨敞',
prop: 'remarks'
}, {
- label: '鍩硅鏃ユ湡',
- prop: 'trainDate'
+ label: '鐩戠潱椤圭洰',
+ prop: 'superviseProject'
}, {
label: '鍒涘缓',
prop: 'createBy'
--
Gitblit v1.9.3