From 6277f995556330972d3c9985cd64a6a649ef9c9e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 18 六月 2025 14:15:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/platform/LogisticsRecord/waybill.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 300df08..f40ad7f 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -47,6 +47,7 @@
           <span>{{ statusMap[scope.row.status] }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="editUserName" label="鏈�鍚庢搷浣滀汉鍛�" min-width="150" show-overflow-tooltip />
       <el-table-column prop="name" label="鎿嶄綔" min-width="170" align="center" fixed="right" show-overflow-tooltip>
         <template v-slot="scope">
           <el-button type="text" @click="complete([scope.row.id])" v-if="[0,1,2].includes(scope.row.status)">瀹屾垚浣滀笟</el-button>

--
Gitblit v1.9.3