From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/components/view/a7-Ensure-results-validity.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/view/a7-Ensure-results-validity.vue b/src/components/view/a7-Ensure-results-validity.vue
index 2c6ba99..6df1472 100644
--- a/src/components/view/a7-Ensure-results-validity.vue
+++ b/src/components/view/a7-Ensure-results-validity.vue
@@ -225,7 +225,7 @@
minWidth: '160'
}, {
label: '鍒涘缓浜�',
- prop: 'createUser',
+ prop: 'createUserName',
minWidth: '100'
}, {
dataType: 'action',
@@ -316,7 +316,7 @@
minWidth: '150px'
}, {
dataType: 'action',
- width: '180',
+ width: '220',
label: '鎿嶄綔',
fixed: 'right',
operation: [
--
Gitblit v1.9.3