From 400169d87dee7a40802824875167a4dec4ef3bc0 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 24 四月 2026 15:34:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 2f84ce8..73e5df9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,7 +9,6 @@
<result column="product_id" property="productId" />
<result column="model" property="model" />
<result column="unit" property="unit" />
- <result column="speculative_trading_name" property="speculativeTradingName" />
<result column="tenant_id" property="tenantId" />
<result column="product_name" property="productName" />
<result column="product_id" property="productId" />
@@ -125,4 +124,11 @@
INNER JOIN product t2 ON t1.product_id = t2.id
INNER JOIN tree t ON t2.id = t.id;
</select>
+ <select id="selectOldProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
+ select product_model.*,product.product_name
+ from product_model left join
+ product on product_model.product_id = product.id
+ where product_model.model = #{model}
+ and product.product_name = #{productName}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3