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/ApsMaterialManagementMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml
index 6a5ebe5..7482975 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialManagementMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsMaterialManagementMapper">
- <resultMap type="ApsMaterialManagement" id="ApsMaterialManagementResult">
+ <resultMap type="com.aps.core.domain.ApsMaterialManagement" id="ApsMaterialManagementResult">
<result property="id" column="id" />
<result property="itemNumber" column="item_number" />
<result property="materialDescription" column="material_description" />
@@ -31,7 +31,7 @@
select id, item_number, material_description, material_status, material_type, professional_affiliation, drawing_no, version_number, advance_production_days, split_batch, self_made, applicable_factories, applicable_workshop, effective_date, expiring_date, integration_date, create_by, create_time, update_by, update_time from aps_material_management
</sql>
- <select id="selectApsMaterialManagementList" parameterType="ApsMaterialManagement" resultMap="ApsMaterialManagementResult">
+ <select id="selectApsMaterialManagementList" parameterType="com.aps.core.domain.ApsMaterialManagement" resultMap="ApsMaterialManagementResult">
<include refid="selectApsMaterialManagementVo"/>
<where>
<if test="itemNumber != null "> and item_number = #{itemNumber}</if>
@@ -43,7 +43,7 @@
where id = #{id}
</select>
- <insert id="insertApsMaterialManagement" parameterType="ApsMaterialManagement">
+ <insert id="insertApsMaterialManagement" parameterType="com.aps.core.domain.ApsMaterialManagement">
insert into aps_material_management
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -91,7 +91,7 @@
</trim>
</insert>
- <update id="updateApsMaterialManagement" parameterType="ApsMaterialManagement">
+ <update id="updateApsMaterialManagement" parameterType="com.aps.core.domain.ApsMaterialManagement">
update aps_material_management
<trim prefix="SET" suffixOverrides=",">
<if test="itemNumber != null">item_number = #{itemNumber},</if>
--
Gitblit v1.9.3