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/ApsGasMaterialUsageMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml
index 277d982..10ae43f 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasMaterialUsageMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsGasMaterialUsageMapper">
- <resultMap type="ApsGasMaterialUsage" id="ApsGasMaterialUsageResult">
+ <resultMap type="com.aps.core.domain.ApsGasMaterialUsage" id="ApsGasMaterialUsageResult">
<result property="id" column="id" />
<result property="itemNumber" column="item_number" />
<result property="drawingNo" column="drawing_no" />
@@ -20,7 +20,7 @@
select id, item_number, drawing_no, version, process_name, standard_amount, org_code, create_by, create_time, del_flag from aps_gas_material_usage
</sql>
- <select id="selectApsGasMaterialUsageList" parameterType="ApsGasMaterialUsage" resultMap="ApsGasMaterialUsageResult">
+ <select id="selectApsGasMaterialUsageList" parameterType="com.aps.core.domain.ApsGasMaterialUsage" resultMap="ApsGasMaterialUsageResult">
<include refid="selectApsGasMaterialUsageVo"/>
<where>
<if test="itemNumber != null and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -38,7 +38,7 @@
where id = #{id}
</select>
- <insert id="insertApsGasMaterialUsage" parameterType="ApsGasMaterialUsage" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertApsGasMaterialUsage" parameterType="com.aps.core.domain.ApsGasMaterialUsage" useGeneratedKeys="true" keyProperty="id">
insert into aps_gas_material_usage
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="itemNumber != null">item_number,</if>
@@ -64,7 +64,7 @@
</trim>
</insert>
- <update id="updateApsGasMaterialUsage" parameterType="ApsGasMaterialUsage">
+ <update id="updateApsGasMaterialUsage" parameterType="com.aps.core.domain.ApsGasMaterialUsage">
update aps_gas_material_usage
<trim prefix="SET" suffixOverrides=",">
<if test="itemNumber != null">item_number = #{itemNumber},</if>
--
Gitblit v1.9.3