From d7427ab305dc17af447f5832903691eee329850c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yufei' into yufei
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index 198aed0..ffd50a8 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -57,6 +57,9 @@
<if test="productSn != null and productSn != ''">
and sr.product_sn like concat('%',#{productSn},'%')
</if>
+ <if test="warehouseName != null and warehouseName != ''">
+ and sw.name like concat('%',#{warehouseName},'%')
+ </if>
</sql>
<sql id="queryColumns">
--
Gitblit v1.9.2