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/view/a7-quality-control-plan.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/view/a7-quality-control-plan.vue b/src/components/view/a7-quality-control-plan.vue
index 491b737..2fd1335 100644
--- a/src/components/view/a7-quality-control-plan.vue
+++ b/src/components/view/a7-quality-control-plan.vue
@@ -185,7 +185,7 @@
minWidth: '160'
}, {
label: '鍒涘缓浜�',
- prop: 'createUser',
+ prop: 'createUserName',
minWidth: '100'
}, {
dataType: 'action',
--
Gitblit v1.9.3