From 239f117fab7b05566914fb3f4f445203f08ded3d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 27 八月 2025 13:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

---
 src/api/warehouseManagement/index.js |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/api/warehouseManagement/index.js b/src/api/warehouseManagement/index.js
index 047a7e2..859f8e9 100644
--- a/src/api/warehouseManagement/index.js
+++ b/src/api/warehouseManagement/index.js
@@ -48,4 +48,20 @@
         method: 'get',
         params: query
     })
+}
+// 鎻愪氦鍚堝苟
+export function merge(query) {
+    return request({
+        url: '/officialInventory/merge',
+        method: 'post',
+        data: query
+    })
+}
+// 姝e紡搴撳瓨缂栬緫
+export function editOfficial(query) {
+    return request({
+        url: '/officialInventory/editOfficial',
+        method: 'post',
+        data: query
+    })
 }
\ No newline at end of file

--
Gitblit v1.9.3