From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 500e4f9..176d4c2 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" />
@@ -126,9 +125,12 @@
INNER JOIN tree t ON t2.id = t.id;
</select>
<select id="selectOldProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
- select * from product_model left join
+ 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}
+ order by product_model.id desc
+ LIMIT 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3