From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/TechnicalModelMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/base-server/src/main/resources/mapper/TechnicalModelMapper.xml b/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
index 62485d2..731903d 100644
--- a/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
@@ -30,7 +30,7 @@
<resultMap id="selectAllTechNamTowMap" type="map">
<id property="id" column="id"/>
<result property="name" column="name"/>
- <result property="name" column="unit"/>
+ <result property="unit" column="unit"/>
</resultMap>
<select id="selectAllTechNam" resultMap="selectAllTechNamMap">
select id,
@@ -52,7 +52,7 @@
<result property="name" column="techName"/>
</resultMap>
<select id="chooseTechFath" resultMap="chooseTechFathMap">
- select id techTemId,
+ select id techTemId,
name techName,
father techFather
from mom_ocean.technology_template
@@ -73,6 +73,7 @@
select technical_model.father,
technical_model.name,
unit,
+ technology_template.id,
technology_template.name techName,
technology_template.father techFather,
type
@@ -93,8 +94,8 @@
<!--鍒犻櫎鏍规嵁宸ヨ壓璺嚎id-->
<update id="delTeMoByTechId">
update mom_ocean.technical_model
- set state=0
- where tech_tem_id=#{id}
+ set state=0
+ where tech_tem_id = #{id}
</update>
<!--鎵归噺鍒犻櫎鏍规嵁宸ヨ壓璺嚎id-->
--
Gitblit v1.9.3