From cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 23 十月 2025 11:04:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml b/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml
index 1afd6dd..ce16fb9 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml
@@ -20,8 +20,9 @@
select operate_type from mm.basic_warehouse_type where type regexp #{type};
</select>
+
<select id="getBasicWarehouseTypeAll" >
- select * from mm.basic_warehouse_type where type!='鍘熺墖' and type!='杈呮枡' order by id desc;
+ select * from mm.basic_warehouse_type where type!=#{originalFilm} and type!=#{accessories} order by id desc;
</select>
<insert id="insertBasicWarehouse" useGeneratedKeys="true" >
--
Gitblit v1.8.0