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/ProcessRouteMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51c11b4..86a4862 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.production.mapper.ProcessRouteMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRoute">
+ <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProcessRoute">
<id property="id" column="id"/>
<result property="productModelId" column="product_model_id"/>
<result property="description" column="description"/>
@@ -12,7 +12,7 @@
<result property="updateTime" column="update_time"/>
</resultMap>
- <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
+ <select id="pageProcessRouteDto" resultType="com.ruoyi.production2.dto.ProcessRouteDto">
select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
from process_route ps
left join product_bom pb on ps.bom_id = pb.id
--
Gitblit v1.9.3