From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductStructureMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index e4a0795..920db52 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductStructureMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductStructure">
+ <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProductStructure">
<id property="id" column="id"/>
<result property="productModelId" column="product_model_id"/>
<result property="processId" column="process_id"/>
@@ -11,7 +11,7 @@
<result property="unit" column="unit"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
- <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="listBybomId" resultType="com.ruoyi.production2.dto.ProductStructureDto">
select ps.*,
p.product_name,
pp.name as process_name,
@@ -25,7 +25,7 @@
where ps.bom_id = #{bomId}
order by ps.id
</select>
- <select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="listBybomAndProcess" resultType="com.ruoyi.production2.dto.ProductStructureDto">
select ps.*,
p.product_name,
pp.name as process_name,
--
Gitblit v1.9.3