From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +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 2a8d27f..1f593da 100644
--- a/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/base-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -49,10 +49,10 @@
<!--鏍规嵁id鏌ョ湅璇︽儏-->
<resultMap id="selecTechByIdMap" type="map">
- <id property="id" column="type"/>
- <result property="name" column="father"/>
+ <id property="type" column="type"/>
+ <result property="father" column="father"/>
<result property="name" column="name"/>
- <result property="name" column="device_group"/>
+ <result property="deviceGroup" column="device_group"/>
<collection property="children" resultMap="selecTechByIdsMap" javaType="List"/>
</resultMap>
<resultMap id="selecTechByIdsMap" type="map">
--
Gitblit v1.9.3