From 2f50c3b23a14aa649e58c63d62862b6e0eada7ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 05 九月 2023 17:04:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 803a3f4..1f593da 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,
--
Gitblit v1.9.3