From 584e6a7781c3c3e53a517a6ffd8e97dbf2f737ba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Aug 2022 09:33:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
index b4824f9..0e55b4f 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -158,7 +158,7 @@
                  sys_stockrecord st
             LEFT JOIN (SELECT id, agricultural_name, factory_name,type FROM sys_stockfactory) stf
             ON st.stock_id1 = stf.id
-        <if test="stock.stockType !=null and stock.stockType != '' ">
+        <if test="stock.stockType !=null and stock.stockType !=''">
             WHERE stf.type =#{stock.stockType}
         </if>
         GROUP BY

--
Gitblit v1.9.3