From 9cbf54543334ff0166656a971899c45807c08275 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 01 七月 2025 14:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/warehouseManagement/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index e26abe1..7fd5435 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -39,7 +39,7 @@
<!-- 鎿嶄綔鎸夐挳鍖� -->
<el-space>
<!-- <el-button type="danger" :icon="Delete">鍒犻櫎</el-button>-->
- <el-button type="info" plain :icon="Download">瀵煎嚭</el-button>
+ <!-- <el-button type="info" plain :icon="Download">瀵煎嚭</el-button> -->
<el-button type="success" plain :icon="Refresh" v-if="activeTab=== 'officialInventory'" @click="mergeRows('merge')">鍚堝苟</el-button>
</el-space>
<div>
--
Gitblit v1.9.3