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/personnel-capacity.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/do/a6-personnel/personnel-capacity.vue b/src/components/do/a6-personnel/personnel-capacity.vue
index 25a8800..58c9435 100644
--- a/src/components/do/a6-personnel/personnel-capacity.vue
+++ b/src/components/do/a6-personnel/personnel-capacity.vue
@@ -297,7 +297,7 @@
}
}, {
label: '纭浜�',
- prop: 'confirmOperatingPersonnelId',
+ prop: 'confirmOperatingPersonnelName',
minWidth: '100'
}, {
label: '纭鏃ユ湡',
--
Gitblit v1.9.3