From 4ad61e4c257621124625a89853eaa8334a11b0be Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 11:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/resources/mapper/TechnologyMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/standard-server/src/main/resources/mapper/TechnologyMapper.xml b/standard-server/src/main/resources/mapper/TechnologyMapper.xml
index c01980b..b4b32e1 100644
--- a/standard-server/src/main/resources/mapper/TechnologyMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechnologyMapper.xml
@@ -12,7 +12,7 @@
 
     <!--鍙充晶鏁版嵁灞曠ず 宸ヨ壓璺嚎-->
     <resultMap id="selectAllTecMap" type="map">
-        <id property="name" column="father"/>
+        <id property="father" column="father"/>
         <collection property="children" resultMap="selectAllTecMaps" javaType="List"/>
     </resultMap>
     <resultMap id="selectAllTecMaps" type="map">

--
Gitblit v1.9.3