From a5e08addf5745b587d54c7536996259d5505261a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 四月 2026 09:33:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 2f84ce8..500e4f9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -125,4 +125,10 @@
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 * 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