From 590dfcc348a7ae54fe18de992a27e5708ece1cb5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 7 Mar 2023 15:53:15 +0800
Subject: [PATCH] BUG 52

---
 project/qujing/app/AppConflictMediation/components/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/qujing/app/AppConflictMediation/components/List.vue b/project/qujing/app/AppConflictMediation/components/List.vue
index a8a31c80..4bcbd7d6 100644
--- a/project/qujing/app/AppConflictMediation/components/List.vue
+++ b/project/qujing/app/AppConflictMediation/components/List.vue
@@ -75,7 +75,7 @@ export default {
         {prop: 'groupName', label: '事件类型', align: 'center'},
         {prop: 'girdName', label: '所属网格', align: 'center'},
         {prop: 'eventStatus', label: '事件状态', align: 'center', dict: "conflictEventStatus"},
-        {prop: 'userName', label: '上报人', align: 'center'},
+        {prop: 'name', label: '上报人', align: 'center'},
         {slot: 'options'}
       ]
     }