From 533bccb991763a5c2db8a958fa5003b90b196cfc Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 18:05:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
index 5770b88..af28ae3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamMapper">
- <resultMap type="ApsWeldSeam" id="ApsWeldSeamResult">
+ <resultMap type="com.aps.core.domain.ApsWeldSeam" id="ApsWeldSeamResult">
<result property="id" column="id" />
<result property="workOrderType" column="work_order_type" />
<result property="materialCode" column="material_code" />
@@ -32,7 +32,7 @@
select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant from aps_weld_seam
</sql>
- <select id="selectApsWeldSeamList" parameterType="ApsWeldSeam" resultMap="ApsWeldSeamResult">
+ <select id="selectApsWeldSeamList" parameterType="com.aps.core.domain.ApsWeldSeam" resultMap="ApsWeldSeamResult">
<include refid="selectApsWeldSeamVo"/>
<where>
<if test="workOrderType != null and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
@@ -66,7 +66,7 @@
<include refid="selectApsWeldSeamVo"/>
where work_order_no = #{workOrderNo}
</select>
- <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
+ <insert id="insertApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
insert into aps_weld_seam
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -116,7 +116,7 @@
</trim>
</insert>
- <update id="updateApsWeldSeam" parameterType="ApsWeldSeam">
+ <update id="updateApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
update aps_weld_seam
<trim prefix="SET" suffixOverrides=",">
<if test="workOrderType != null">work_order_type = #{workOrderType},</if>
--
Gitblit v1.9.3