From db85e062349683b3131726fe90dcc99d4aff35ba Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 06 一月 2026 13:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 4e889f7..e4e665c 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -25,9 +25,6 @@
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name  like  concat('%',#{c.productName},'%')
             </if>
-            <if test="c.speculativeTradingName != null and c.speculativeTradingName != ''">
-                and pm.speculative_trading_name like  concat('%',#{c.speculativeTradingName},'%')
-            </if>
         </where>
         order by  pm.id
     </select>

--
Gitblit v1.9.3