From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/orderLog.vue |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/admin/src/views/business/orderLog.vue b/admin/src/views/business/orderLog.vue
index 2bff094..e0c4d29 100644
--- a/admin/src/views/business/orderLog.vue
+++ b/admin/src/views/business/orderLog.vue
@@ -59,6 +59,7 @@
         <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:orderlog:delete']">鍒犻櫎</el-button></li>
       </ul>
       <el-table
+          :height="tableHeightNew"
         v-loading="isWorking.search"
         :data="tableData.list"
         stripe

--
Gitblit v1.9.3