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/ProductOrderMaterialMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMaterialMapper.xml b/src/main/resources/mapper/production/ProductOrderMaterialMapper.xml
index fc1454e..52b0952 100644
--- a/src/main/resources/mapper/production/ProductOrderMaterialMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMaterialMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductOrderMaterialMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductOrderMaterial">
+ <resultMap id="BaseResultMap" type="com.ruoyi.production2.pojo.ProductOrderMaterial">
<id column="id" property="id" />
<result column="tenant_id" property="tenantId" />
<result column="process_name" property="processName" />
@@ -21,7 +21,7 @@
<result column="update_user" property="updateUser" />
</resultMap>
- <select id="pickMaterial" resultType="com.ruoyi.production.pojo.ProductOrderMaterial">
+ <select id="pickMaterial" resultType="com.ruoyi.production2.pojo.ProductOrderMaterial">
SELECT
si.id,
si.qualitity,
@@ -47,7 +47,7 @@
LEFT JOIN product p1 ON p1.id = p.parent_id
</select>
- <select id="selectLeafNode" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="selectLeafNode" resultType="com.ruoyi.production2.dto.ProductStructureDto">
SELECT
ps.*,
p.product_name,
@@ -66,7 +66,7 @@
ps.id
</select>
- <select id="selectByProductModelIds" resultType="com.ruoyi.production.dto.ProductOrderMaterialDto">
+ <select id="selectByProductModelIds" resultType="com.ruoyi.production2.dto.ProductOrderMaterialDto">
SELECT
si.id,
si.qualitity,
--
Gitblit v1.9.3