From 6be6a7f6225da2160e44c2a98192abbc05577294 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 27 十二月 2024 13:28:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cnas' into master

---
 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