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/ProductBomMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductBomMapper.xml b/src/main/resources/mapper/production/ProductBomMapper.xml
index ec06cd3..dbc4a16 100644
--- a/src/main/resources/mapper/production/ProductBomMapper.xml
+++ b/src/main/resources/mapper/production/ProductBomMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.production.mapper.ProductBomMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductBom">
+ <resultMap id="BaseResultMap" type="com.ruoyi.production2.pojo.ProductBom">
<id column="id" property="id"/>
<result column="product_model_id" property="productModelId"/>
<result column="bom_no" property="bomNo"/>
@@ -15,7 +15,7 @@
<result column="update_user" property="updateUser"/>
<result column="tenant_id" property="tenantId"/>
</resultMap>
- <select id="listPage" resultType="com.ruoyi.production.dto.ProductBomDto">
+ <select id="listPage" resultType="com.ruoyi.production2.dto.ProductBomDto">
select * from (select pb.*,
pm.model productModelName,
p.product_name productName
@@ -36,7 +36,7 @@
and version = #{c.version}
</if>
</select>
- <select id="getById" resultType="com.ruoyi.production.dto.ProductBomDto">
+ <select id="getById" resultType="com.ruoyi.production2.dto.ProductBomDto">
select pb.*,
pm.model productModelName,
p.product_name productName
--
Gitblit v1.9.3