From a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductionProductOutputMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index 97bbf47..6dc9682 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -15,7 +15,7 @@
<result column="update_user" property="updateUser" />
</resultMap>
- <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
+ <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.bean.dto.ProductionProductOutputDto">
select ppo.*,
ppm.product_no as productNo,
pm.model
@@ -35,7 +35,7 @@
order by ppo.create_time desc
</select>
- <select id="selectOutputStats" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
+ <select id="selectOutputStats" resultType="com.ruoyi.production.bean.dto.ProductionProductOutputDto">
select id,
production_product_main_id as productionProductMainId,
product_model_id as productModelId,
--
Gitblit v1.9.3