From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java
index 0288c12..f55f47e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java
@@ -20,7 +20,7 @@
 
     List<String> getBasicWarehouse(String type);
 
-    List<BasicWarehouseType> getBasicWarehouseTypeAll();
+    List<BasicWarehouseType> getBasicWarehouseTypeAll(String originalFilm,String accessories);
 
     Boolean insertBasicWarehouse(@Param("operateTypeName") String operateTypeName,
                                  @Param("operateType") String operateType,

--
Gitblit v1.8.0