From 333d209effc6574985ce5b696d36785ca50b9fcc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 15 四月 2026 17:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 73026c8..adad88d 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -153,11 +153,14 @@
WHERE sl.id = #{salesLedegerId}) A
group by a.model, a.product_name, a.unit
</select>
- <select id="selectProduct" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
+ <select id="selectProduct" resultType="com.ruoyi.sales.dto.SimpleProductDto">
select
+ pm.id,
p.product_name as product_category,
pm.model as specification_model,
- pm.id as product_model_id
+ pm.id as product_model_id,
+ pm.unit,
+ pm.sub_unit
from product_model pm
left join product p on pm.product_id = p.id
</select>
--
Gitblit v1.9.3