From baeae530bc5dfdd23359f34b047f449c1541359f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 27 三月 2024 11:23:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/mm/MaterialStore.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/mm/MaterialStore.xml b/north-glass-erp/target/classes/mapper/mm/MaterialStore.xml
index 4911316..d23e448 100644
--- a/north-glass-erp/target/classes/mapper/mm/MaterialStore.xml
+++ b/north-glass-erp/target/classes/mapper/mm/MaterialStore.xml
@@ -30,7 +30,9 @@
<if test="materialStore.id != null and materialStore.id != ''">
and m.id regexp #{materialStore.id}
</if>
-
+ <if test="materialStore.type != null and materialStore.type != ''">
+ and m.type regexp #{materialStore.type}
+ </if>
</where>
limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0