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/TechnologyTemplateMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 803a3f4..2a8d27f 100644
--- a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -9,14 +9,14 @@
<!--鏌ヨ宸ヨ壓璺嚎鍒楄〃 宸﹁竟浜岀骇灞曠ず-->
<resultMap id="selectAllTechTemMap" type="map">
- <id property="elname" column="elname"/>
+ <id property="name" column="elname"/>
<collection property="children" resultMap="selectAllTechTemTowMap" javaType="List"/>
</resultMap>
<resultMap id="selectAllTechTemTowMap" type="map">
- <result property="father" column="father"/>
+ <result property="name" column="father"/>
</resultMap>
<select id="selectAllTechTem" resultMap="selectAllTechTemMap">
- select e.name elname,
+ select e.name elname,
father
from mom_ocean.technology_template t,
mom_ocean.element e,
@@ -49,10 +49,10 @@
<!--鏍规嵁id鏌ョ湅璇︽儏-->
<resultMap id="selecTechByIdMap" type="map">
- <id property="type" column="type"/>
- <result property="father" column="father"/>
+ <id property="id" column="type"/>
+ <result property="name" column="father"/>
<result property="name" column="name"/>
- <result property="deviceGroup" column="device_group"/>
+ <result property="name" column="device_group"/>
<collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
</resultMap>
<resultMap id="selecTechByIdsMap" type="map">
--
Gitblit v1.9.3