From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/TechnicalModelMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/base-server/src/main/resources/mapper/TechnicalModelMapper.xml b/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
index b859a48..62485d2 100644
--- a/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnicalModelMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.yuanchu.mom.mapper.TechnicalModelMapper">
<!--鏌ヨ鎶�鏈寚鏍囩淮鎶ゅ垪琛� 宸﹁竟浜岀骇灞曠ず宸ュ簭鍜屽伐鑹� -->
<resultMap id="selectAllTechTemMap" type="map">
- <id property="father" column="father"/>
+ <id property="name" column="father"/>
<collection property="children" resultMap="selectAllTechTemTowMap" javaType="List"/>
</resultMap>
<resultMap id="selectAllTechTemTowMap" type="map">
@@ -24,13 +24,13 @@
<!--鏌ヨ鎶�鏈寚鏍囩淮鎶ゅ垪琛� 鍙宠竟灞曠ず璇ュ伐鑹轰笅鐨勬楠岄」鐩�-->
<resultMap id="selectAllTechNamMap" type="map">
- <id property="father" column="father"/>
+ <id property="name" column="father"/>
<collection property="children" resultMap="selectAllTechNamTowMap" javaType="List"/>
</resultMap>
<resultMap id="selectAllTechNamTowMap" type="map">
<id property="id" column="id"/>
<result property="name" column="name"/>
- <result property="unit" column="unit"/>
+ <result property="name" column="unit"/>
</resultMap>
<select id="selectAllTechNam" resultMap="selectAllTechNamMap">
select id,
@@ -44,15 +44,15 @@
<!--鏂板鎶�鏈寚鏍囩淮鎶� 閫夋嫨宸ュ簭鍜屽伐鑹�-->
<resultMap id="chooseTechFathMap" type="map">
- <id property="techFather" column="techFather"/>
+ <id property="name" column="techFather"/>
<collection property="children" resultMap="chooseTechFathTowMap" javaType="List"/>
</resultMap>
<resultMap id="chooseTechFathTowMap" type="map">
- <id property="id" column="id"/>
- <result property="techName" column="techName"/>
+ <id property="id" column="techTemId"/>
+ <result property="name" column="techName"/>
</resultMap>
<select id="chooseTechFath" resultMap="chooseTechFathMap">
- select id,
+ select id techTemId,
name techName,
father techFather
from mom_ocean.technology_template
--
Gitblit v1.9.3