From 2683793796366a4b6361baf4a16e5c65c8dce068 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 四月 2026 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductProcessRouteMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
index dd4809f..c58823e 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.production.mapper.ProductProcessRouteMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductProcessRoute">
+ <resultMap id="BaseResultMap" type="com.ruoyi.production2.pojo.ProductProcessRoute">
<id column="id" property="id"/>
<result column="product_model_id" property="productModelId"/>
<result column="description" property="description"/>
@@ -14,7 +14,7 @@
<result column="process_route_code" property="processRouteCode"/>
<result column="product_order_id" property="productOrderId"/>
</resultMap>
- <select id="listMain" resultType="com.ruoyi.production.dto.ProcessRouteDto">
+ <select id="listMain" resultType="com.ruoyi.production2.dto.ProcessRouteDto">
select ppr.*, p.product_name, pm.product_id, pm.model, pb.bom_no
from product_process_route ppr
left join product_bom pb on ppr.bom_id = pb.id
--
Gitblit v1.9.3