From 569c889395ebe14caf48820e7bfb0551357ec0d2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 九月 2025 08:59:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/BasicWarehouseTypeMapper.java |    4 +++-
 1 files changed, 3 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 8a9acb0..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,
@@ -30,5 +30,7 @@
 
     Boolean updateBasicWarehouse(@Param("id") Long id,@Param("operateTypeName") String operateTypeName);
 
+    List<String> getBasicWarehouseUser(String type);
+
 
 }

--
Gitblit v1.8.0