From 142f2e839bf76eff614ca7c07c30b5da2745681a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 17:47:20 +0800
Subject: [PATCH] 处理冲突
---
src/views/eam/DailyMaintenanceOrderList.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index bf01a53..6b87ca7 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -422,9 +422,9 @@
// dataIndex: 'actualWorkingHourQuota',
// },
{
- title: '鎵ц浜�',
+ title: '鎶ュ伐浜�',
align: "center",
- dataIndex: 'maintenanceUserName'
+ dataIndex: 'maintenanceUserId'
},
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
--
Gitblit v1.9.3